diff --git a/.gitignore b/.gitignore index 16d9ab5..3cf5f35 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ cartodb_services.egg-info/ build/ dist/ +.vscode/ diff --git a/client/cdb_dataservices_client--0.20.0--0.21.0.sql b/client/cdb_dataservices_client--0.20.0--0.21.0.sql index 495deda..048f415 100644 --- a/client/cdb_dataservices_client--0.20.0--0.21.0.sql +++ b/client/cdb_dataservices_client--0.20.0--0.21.0.sql @@ -66,3 +66,7 @@ BEGIN END; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; + +DROP FUNCTION cdb_dataservices_client.obs_getavailablegeometries (geometry(Geometry, 4326), text[], text, text, text); +DROP FUNCTION cdb_dataservices_client._obs_getavailablegeometries_exception_safe (geometry(Geometry, 4326), text[], text, text, text); +DROP FUNCTION cdb_dataservices_client._obs_getavailablegeometries (text, text, geometry(Geometry, 4326), text[], text, text, text); diff --git a/client/cdb_dataservices_client--0.21.0--0.20.0.sql b/client/cdb_dataservices_client--0.21.0--0.20.0.sql index 55b6f37..a072d9a 100644 --- a/client/cdb_dataservices_client--0.21.0--0.20.0.sql +++ b/client/cdb_dataservices_client--0.21.0--0.20.0.sql @@ -60,3 +60,6 @@ BEGIN END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; +DROP FUNCTION cdb_dataservices_client.obs_getavailablegeometries (geometry(Geometry, 4326), text[], text, text, text, integer); +DROP FUNCTION cdb_dataservices_client._obs_getavailablegeometries_exception_safe (geometry(Geometry, 4326), text[], text, text, text, integer); +DROP FUNCTION cdb_dataservices_client._obs_getavailablegeometries (text, text, geometry(Geometry, 4326), text[], text, text, text, integer); diff --git a/server/extension/cdb_dataservices_server--0.27.0--0.28.0.sql b/server/extension/cdb_dataservices_server--0.27.0--0.28.0.sql index a83156b..a3f1842 100644 --- a/server/extension/cdb_dataservices_server--0.27.0--0.28.0.sql +++ b/server/extension/cdb_dataservices_server--0.27.0--0.28.0.sql @@ -16,3 +16,4 @@ RETURNS SETOF cdb_dataservices_server.obs_meta_geometry AS $$ CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname); SELECT * FROM cdb_observatory.OBS_GetAvailableGeometries(bounds, filter_tags, numer_id, denom_id, timespan, number_geometries); $$ LANGUAGE plproxy; +DROP FUNCTION cdb_dataservices_server.OBS_GetAvailableGeometries(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT); diff --git a/server/extension/cdb_dataservices_server--0.28.0--0.27.0.sql b/server/extension/cdb_dataservices_server--0.28.0--0.27.0.sql index aa8b0f0..20207e8 100644 --- a/server/extension/cdb_dataservices_server--0.28.0--0.27.0.sql +++ b/server/extension/cdb_dataservices_server--0.28.0--0.27.0.sql @@ -15,3 +15,4 @@ RETURNS SETOF cdb_dataservices_server.obs_meta_geometry AS $$ CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname); SELECT * FROM cdb_observatory.OBS_GetAvailableGeometries(bounds, filter_tags, numer_id, denom_id, timespan); $$ LANGUAGE plproxy; +DROP FUNCTION cdb_dataservices_server.OBS_GetAvailableGeometries(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT, INTEGER); diff --git a/server/extension/test/expected/100_data_observatory_test.out b/server/extension/test/expected/100_data_observatory_test.out index 8f95ba1..1a5fd7a 100644 --- a/server/extension/test/expected/100_data_observatory_test.out +++ b/server/extension/test/expected/100_data_observatory_test.out @@ -245,7 +245,7 @@ SELECT exists(SELECT * INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' AND proname = 'obs_getavailablegeometries' - AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text'); + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text, integer'); exists -------- t diff --git a/server/extension/test/sql/100_data_observatory_test.sql b/server/extension/test/sql/100_data_observatory_test.sql index b576add..200024b 100644 --- a/server/extension/test/sql/100_data_observatory_test.sql +++ b/server/extension/test/sql/100_data_observatory_test.sql @@ -157,7 +157,7 @@ SELECT exists(SELECT * INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' AND proname = 'obs_getavailablegeometries' - AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text'); + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text, integer'); SELECT exists(SELECT * FROM pg_proc p