From 623faf1a22ebaffb05f6acfca649949c1a7a93df Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 7 Nov 2016 13:59:57 +0100 Subject: [PATCH 1/7] Added make release option for client --- client/Makefile | 50 ++++++++++++++++++--------- client/upgrade_downgrade_template.erb | 5 +++ 2 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 client/upgrade_downgrade_template.erb diff --git a/client/Makefile b/client/Makefile index 78a6996..fe6939d 100644 --- a/client/Makefile +++ b/client/Makefile @@ -4,29 +4,31 @@ EXTENSION = cdb_dataservices_client EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") # The new version to be generated from templates +SED = sed +ERB = erb +REPLACEMENTS = -i 's/$(EXTVERSION)/$(NEW_VERSION)/g' NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql + +# OLD_VERSIONS = $(wildcard old_versions/*.sql) +# DATA = $(NEW_EXTENSION_ARTIFACT) \ +# $(OLD_VERSIONS) \ +# cdb_dataservices_client--0.11.0--0.11.1.sql \ +# cdb_dataservices_client--0.11.1--0.11.0.sql OLD_VERSIONS = $(wildcard old_versions/*.sql) +DATA = $(NEW_EXTENSION_ARTIFACT) \ + $(EXTENSION)--*--*.sql \ + $(OLD_VERSIONS) +SOURCES_DATA_DIR = sql/ + + +REGRESS = $(notdir $(basename $(wildcard test/sql/*test.sql))) +TEST_DIR = test/ +REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)' --user='postgres' # DATA is a special variable used by postgres build infrastructure # These are the files to be installed in the server shared dir, # for installation from scratch, upgrades and downgrades. # @see http://www.postgresql.org/docs/current/static/extend-pgxs.html -DATA = $(NEW_EXTENSION_ARTIFACT) \ - $(OLD_VERSIONS) \ - cdb_dataservices_client--0.11.0--0.11.1.sql \ - cdb_dataservices_client--0.11.1--0.11.0.sql - - -REGRESS = $(notdir $(basename $(wildcard test/sql/*test.sql))) -TEST_DIR = test/ -REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)' - -# postgres build stuff -PG_CONFIG = pg_config -PGXS := $(shell $(PG_CONFIG) --pgxs) -include $(PGXS) - -SOURCES_DATA_DIR = sql/ # The interface definition is used along with some templates to automatically generate code RENDERER = renderer/sql-template-renderer @@ -35,6 +37,11 @@ TEMPLATE_DIR = renderer/templates TEMPLATE_FILES = $(wildcard $(TEMPLATE_DIR)/*.erb) GENERATED_SQL_FILES = $(patsubst $(TEMPLATE_DIR)/%.erb, $(SOURCES_DATA_DIR)/%.sql, $(TEMPLATE_FILES)) +# postgres build stuff +PG_CONFIG = pg_config +PGXS := $(shell $(PG_CONFIG) --pgxs) +include $(PGXS) + $(GENERATED_SQL_FILES): $(SOURCES_DATA_DIR)/%.sql: $(TEMPLATE_DIR)/%.erb $(INTERFACE_FILE) $(RENDERER) $(RENDERER) $(INTERFACE_FILE) $< > $@ @@ -44,9 +51,20 @@ $(NEW_EXTENSION_ARTIFACT): $(SOURCES_DATA) rm -f $@ cat $(SOURCES_DATA_DIR)/*.sql >> $@ +.PHONY: all all: $(DATA) +.PHONY: release +release: $(EXTENSION).control $(SOURCES_DATA) + test -n "$(NEW_VERSION)" # $$NEW_VERSION VARIABLE MISSING. Eg. make release NEW_VERSION=0.x.0 + mv *.sql old_versions + $(SED) $(REPLACEMENTS) $(EXTENSION).control + cat $(SOURCES_DATA_DIR)/*.sql > $(EXTENSION)--$(NEW_VERSION).sql + $(ERB) version=$(NEW_VERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql + $(ERB) version=$(EXTVERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql + # Only meant for development time, do not use once a version is released +.PHONY: devclean devclean: rm -f $(NEW_EXTENSION_ARTIFACT) rm -f $(GENERATED_SQL_FILES) diff --git a/client/upgrade_downgrade_template.erb b/client/upgrade_downgrade_template.erb new file mode 100644 index 0000000..bc8eb7c --- /dev/null +++ b/client/upgrade_downgrade_template.erb @@ -0,0 +1,5 @@ +--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES +-- Complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "ALTER EXTENSION cdb_dataservices_client UPDATE TO '<%= version %>'" to load this file. \quit + +-- HERE goes your code to upgrade/downgrade From b403e1d69af7ef3616d9d17a1354ce67a9c2e4a7 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 7 Nov 2016 14:02:01 +0100 Subject: [PATCH 2/7] Move old 0.11.1 version to a proper folder --- .../cdb_dataservices_client--0.11.0--0.11.1.sql | 0 .../cdb_dataservices_client--0.11.1--0.11.0.sql | 0 client/{ => old_versions}/cdb_dataservices_client--0.11.1.sql | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename client/{ => old_versions}/cdb_dataservices_client--0.11.0--0.11.1.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.11.1--0.11.0.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.11.1.sql (100%) diff --git a/client/cdb_dataservices_client--0.11.0--0.11.1.sql b/client/old_versions/cdb_dataservices_client--0.11.0--0.11.1.sql similarity index 100% rename from client/cdb_dataservices_client--0.11.0--0.11.1.sql rename to client/old_versions/cdb_dataservices_client--0.11.0--0.11.1.sql diff --git a/client/cdb_dataservices_client--0.11.1--0.11.0.sql b/client/old_versions/cdb_dataservices_client--0.11.1--0.11.0.sql similarity index 100% rename from client/cdb_dataservices_client--0.11.1--0.11.0.sql rename to client/old_versions/cdb_dataservices_client--0.11.1--0.11.0.sql diff --git a/client/cdb_dataservices_client--0.11.1.sql b/client/old_versions/cdb_dataservices_client--0.11.1.sql similarity index 100% rename from client/cdb_dataservices_client--0.11.1.sql rename to client/old_versions/cdb_dataservices_client--0.11.1.sql From 94099540d794f4b3281c6bf8df2280f6b14bbeec Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 7 Nov 2016 14:02:33 +0100 Subject: [PATCH 3/7] New version 0.12.0 sql files --- client/cdb_dataservices_client--0.11.1--0.12.0.sql | 5 +++++ client/cdb_dataservices_client--0.12.0--0.11.1.sql | 5 +++++ client/cdb_dataservices_client.control | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 client/cdb_dataservices_client--0.11.1--0.12.0.sql create mode 100644 client/cdb_dataservices_client--0.12.0--0.11.1.sql diff --git a/client/cdb_dataservices_client--0.11.1--0.12.0.sql b/client/cdb_dataservices_client--0.11.1--0.12.0.sql new file mode 100644 index 0000000..126503e --- /dev/null +++ b/client/cdb_dataservices_client--0.11.1--0.12.0.sql @@ -0,0 +1,5 @@ +--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES +-- Complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "ALTER EXTENSION cdb_dataservices_client UPDATE TO '0.12.0'" to load this file. \quit + +-- HERE goes your code to upgrade/downgrade diff --git a/client/cdb_dataservices_client--0.12.0--0.11.1.sql b/client/cdb_dataservices_client--0.12.0--0.11.1.sql new file mode 100644 index 0000000..c1a081c --- /dev/null +++ b/client/cdb_dataservices_client--0.12.0--0.11.1.sql @@ -0,0 +1,5 @@ +--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES +-- Complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "ALTER EXTENSION cdb_dataservices_client UPDATE TO '0.11.1'" to load this file. \quit + +-- HERE goes your code to upgrade/downgrade diff --git a/client/cdb_dataservices_client.control b/client/cdb_dataservices_client.control index 86a31d1..6b2732a 100644 --- a/client/cdb_dataservices_client.control +++ b/client/cdb_dataservices_client.control @@ -1,5 +1,5 @@ comment = 'CartoDB dataservices client API extension' -default_version = '0.11.1' +default_version = '0.12.0' requires = 'plproxy, cartodb' superuser = true schema = cdb_dataservices_client From 38f2592b2241842c75f99fb240a681536c0625c6 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 7 Nov 2016 17:56:09 +0100 Subject: [PATCH 4/7] Client addition of observatory meta functions --- client/renderer/interface.yaml | 51 ++++++++++++++++++++++++++++++++++ client/sql/16_custom_types.sql | 11 +++++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/client/renderer/interface.yaml b/client/renderer/interface.yaml index 7c744e3..b063535 100644 --- a/client/renderer/interface.yaml +++ b/client/renderer/interface.yaml @@ -326,3 +326,54 @@ no_params: true params: - {} + +- name: obs_getavailablenumerators + return_type: SETOF cdb_dataservices_client.obs_meta_numerator + multi_row: true + multi_field: true + params: + - { name: bounds, type: "geometry(Geometry, 4326)", default: 'NULL' } + - { name: filter_tags, type: "text[]", default: 'NULL' } + - { name: denom_id, type: text, default: 'NULL' } + - { name: geom_id, type: text, default: 'NULL' } + - { name: timespan, type: text, default: 'NULL'} + +- name: obs_getavailabledenominators + return_type: SETOF cdb_dataservices_client.obs_meta_denominator + multi_row: true + multi_field: true + params: + - { name: bounds, type: "geometry(Geometry, 4326)", default: 'NULL' } + - { name: filter_tags, type: "text[]", default: 'NULL' } + - { name: numer_id, type: text, default: 'NULL' } + - { name: geom_id, type: text, default: 'NULL' } + - { name: timespan, type: text, default: 'NULL'} + +- name: obs_getavailablegeometries + return_type: SETOF cdb_dataservices_client.obs_meta_geometry + multi_row: true + multi_field: true + params: + - { name: bounds, type: "geometry(Geometry, 4326)", default: 'NULL' } + - { name: filter_tags, type: "text[]", default: 'NULL' } + - { name: numer_id, type: text, default: 'NULL' } + - { name: denom_id, type: text, default: 'NULL' } + - { name: timespan, type: text, default: 'NULL'} + +- name: obs_getavailabletimespans + return_type: SETOF cdb_dataservices_client.obs_meta_timespan + multi_row: true + multi_field: true + params: + - { name: bounds, type: "geometry(Geometry, 4326)", default: 'NULL' } + - { name: filter_tags, type: "text[]", default: 'NULL' } + - { name: numer_id, type: text, default: 'NULL' } + - { name: denom_id, type: text, default: 'NULL' } + - { name: geom_id, type: text, default: 'NULL'} + +- name: obs_legacybuildermetadata + return_type: TABLE(name text, subsection jsonb) + multi_row: true + multi_field: true + params: + - { name: aggregate_type, type: text, default: 'NULL' } diff --git a/client/sql/16_custom_types.sql b/client/sql/16_custom_types.sql index 97d728c..9f26b97 100644 --- a/client/sql/16_custom_types.sql +++ b/client/sql/16_custom_types.sql @@ -8,4 +8,13 @@ CREATE TYPE cdb_dataservices_client.simple_route AS ( shape geometry(LineString,4326), length real, duration integer -); \ No newline at end of file +); + +-- For the OBS_Meta functions +CREATE TYPE cdb_dataservices_client.obs_meta_numerator AS (numer_id text, numer_name text, numer_description text, numer_weight text, numer_license text, numer_source text, numer_type text, numer_aggregate text, numer_extra jsonb, numer_tags jsonb, valid_denom boolean, valid_geom boolean, valid_timespan boolean); + +CREATE TYPE cdb_dataservices_client.obs_meta_denominator AS (denom_id text, denom_name text, denom_description text, denom_weight text, denom_license text, denom_source text, denom_type text, denom_aggregate text, denom_extra jsonb, denom_tags jsonb, valid_numer boolean, valid_geom boolean, valid_timespan boolean); + +CREATE TYPE cdb_dataservices_client.obs_meta_geometry AS (geom_id text, geom_name text, geom_description text, geom_weight text, geom_aggregate text, geom_license text, geom_source text, valid_numer boolean, valid_denom boolean, valid_timespan boolean); + +CREATE TYPE cdb_dataservices_client.obs_meta_timespan AS (timespan_id text, timespan_name text, timespan_description text, timespan_weight text, timespan_aggregate text, timespan_license text, timespan_source text, valid_numer boolean, valid_denom boolean, valid_geom boolean); From a006f762855c42c9780fb9b7135444046a46da6a Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 7 Nov 2016 17:58:19 +0100 Subject: [PATCH 5/7] New server version 0.18.0 --- server/extension/cdb_dataservices_server--0.17.0--0.18.0.sql | 5 +++++ server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql | 5 +++++ server/extension/cdb_dataservices_server.control | 2 +- .../cdb_dataservices_server--0.16.0--0.17.0.sql | 0 .../cdb_dataservices_server--0.17.0--0.16.0.sql | 0 .../{ => old_versions}/cdb_dataservices_server--0.17.0.sql | 0 6 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 server/extension/cdb_dataservices_server--0.17.0--0.18.0.sql create mode 100644 server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql rename server/extension/{ => old_versions}/cdb_dataservices_server--0.16.0--0.17.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.17.0--0.16.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.17.0.sql (100%) diff --git a/server/extension/cdb_dataservices_server--0.17.0--0.18.0.sql b/server/extension/cdb_dataservices_server--0.17.0--0.18.0.sql new file mode 100644 index 0000000..cc7ce4b --- /dev/null +++ b/server/extension/cdb_dataservices_server--0.17.0--0.18.0.sql @@ -0,0 +1,5 @@ +--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES +-- Complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.18.0'" to load this file. \quit + +-- HERE goes your code to upgrade/downgrade \ No newline at end of file diff --git a/server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql b/server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql new file mode 100644 index 0000000..637ee0e --- /dev/null +++ b/server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql @@ -0,0 +1,5 @@ +--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES +-- Complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.17.0'" to load this file. \quit + +-- HERE goes your code to upgrade/downgrade \ No newline at end of file diff --git a/server/extension/cdb_dataservices_server.control b/server/extension/cdb_dataservices_server.control index a84fc1c..1e6bfa5 100644 --- a/server/extension/cdb_dataservices_server.control +++ b/server/extension/cdb_dataservices_server.control @@ -1,5 +1,5 @@ comment = 'CartoDB dataservices server extension' -default_version = '0.17.0' +default_version = '0.18.0' requires = 'plpythonu, plproxy, postgis, cdb_geocoder' superuser = true schema = cdb_dataservices_server diff --git a/server/extension/cdb_dataservices_server--0.16.0--0.17.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.16.0--0.17.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.16.0--0.17.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.16.0--0.17.0.sql diff --git a/server/extension/cdb_dataservices_server--0.17.0--0.16.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.17.0--0.16.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.17.0--0.16.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.17.0--0.16.0.sql diff --git a/server/extension/cdb_dataservices_server--0.17.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.17.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.17.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.17.0.sql From 040b094b01bea910b436d70e21bdd583da5dd46e Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 7 Nov 2016 18:17:12 +0100 Subject: [PATCH 6/7] New observatory meta functions for server side --- .../sql/130_data_observatory_helper.sql | 70 +++++++++++++++++++ .../expected/100_data_observatory_test.out | 55 +++++++++++++++ .../test/sql/100_data_observatory_test.sql | 37 +++++++++- 3 files changed, 161 insertions(+), 1 deletion(-) diff --git a/server/extension/sql/130_data_observatory_helper.sql b/server/extension/sql/130_data_observatory_helper.sql index 841872c..20c0d0c 100644 --- a/server/extension/sql/130_data_observatory_helper.sql +++ b/server/extension/sql/130_data_observatory_helper.sql @@ -3,3 +3,73 @@ RETURNS text AS $$ CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname); SELECT cdb_observatory.obs_dumpversion(); $$ LANGUAGE plproxy; + +-- We could create a super type for the common data like id, name and so on but we need to parse inside the functions because the -- the return data tha comes from OBS is a TABLE() with them +CREATE TYPE cdb_dataservices_server.obs_meta_numerator AS (numer_id text, numer_name text, numer_description text, numer_weight text, numer_license text, numer_source text, numer_type text, numer_aggregate text, numer_extra jsonb, numer_tags jsonb, valid_denom boolean, valid_geom boolean, valid_timespan boolean); + +CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableNumerators( + username TEXT, + orgname TEXT, + bounds geometry(Geometry, 4326) DEFAULT NULL, + filter_tags TEXT[] DEFAULT NULL, + denom_id TEXT DEFAULT NULL, + geom_id TEXT DEFAULT NULL, + timespan TEXT DEFAULT NULL) +RETURNS SETOF cdb_dataservices_server.obs_meta_numerator AS $$ + CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname); + SELECT * FROM cdb_observatory.OBS_GetAvailableNumerators(bounds, filter_tags, denom_id, geom_id, timespan); +$$ LANGUAGE plproxy; + +CREATE TYPE cdb_dataservices_server.obs_meta_denominator AS (denom_id text, denom_name text, denom_description text, denom_weight text, denom_license text, denom_source text, denom_type text, denom_aggregate text, denom_extra jsonb, denom_tags jsonb, valid_numer boolean, valid_geom boolean, valid_timespan boolean); + +CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableDenominators( + username TEXT, + orgname TEXT, + bounds geometry(Geometry, 4326) DEFAULT NULL, + filter_tags TEXT[] DEFAULT NULL, + numer_id TEXT DEFAULT NULL, + geom_id TEXT DEFAULT NULL, + timespan TEXT DEFAULT NULL) +RETURNS SETOF cdb_dataservices_server.obs_meta_denominator AS $$ + CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname); + SELECT * FROM cdb_observatory.OBS_GetAvailableDenominators(bounds, filter_tags, numer_id, geom_id, timespan); +$$ LANGUAGE plproxy; + +CREATE TYPE cdb_dataservices_server.obs_meta_geometry AS (geom_id text, geom_name text, geom_description text, geom_weight text, geom_aggregate text, geom_license text, geom_source text, valid_numer boolean, valid_denom boolean, valid_timespan boolean); + +CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableGeometries( + username TEXT, + orgname TEXT, + bounds geometry(Geometry, 4326) DEFAULT NULL, + filter_tags TEXT[] DEFAULT NULL, + numer_id TEXT DEFAULT NULL, + denom_id TEXT DEFAULT NULL, + timespan TEXT DEFAULT NULL) +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; + +CREATE TYPE cdb_dataservices_server.obs_meta_timespan AS (timespan_id text, timespan_name text, timespan_description text, timespan_weight text, timespan_aggregate text, timespan_license text, timespan_source text, valid_numer boolean, valid_denom boolean, valid_geom boolean); + +CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableTimespans( + username TEXT, + orgname TEXT, + bounds geometry(Geometry, 4326) DEFAULT NULL, + filter_tags TEXT[] DEFAULT NULL, + numer_id TEXT DEFAULT NULL, + denom_id TEXT DEFAULT NULL, + geom_id TEXT DEFAULT NULL) +RETURNS SETOF cdb_dataservices_server.obs_meta_timespan AS $$ + CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname); + SELECT * FROM cdb_observatory.OBS_GetAvailableTimespans(bounds, filter_tags, numer_id, denom_id, geom_id); +$$ LANGUAGE plproxy; + +CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_LegacyBuilderMetadata( + username TEXT, + orgname TEXT, + aggregate_type TEXT DEFAULT NULL) +RETURNS TABLE(name TEXT, subsection JSONB) AS $$ + CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname); + SELECT * FROM cdb_observatory.OBS_LegacyBuilderMetadata(aggregate_type); +$$ LANGUAGE plproxy; diff --git a/server/extension/test/expected/100_data_observatory_test.out b/server/extension/test/expected/100_data_observatory_test.out index 1b45174..23cd4e1 100644 --- a/server/extension/test/expected/100_data_observatory_test.out +++ b/server/extension/test/expected/100_data_observatory_test.out @@ -185,3 +185,58 @@ SELECT exists(SELECT * t (1 row) +SELECT exists(SELECT * + FROM pg_proc p + INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) + WHERE ns.nspname = 'cdb_dataservices_server' + AND proname = 'obs_getavailablenumerators' + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text'); + exists +-------- + t +(1 row) + +SELECT exists(SELECT * + FROM pg_proc p + INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) + WHERE ns.nspname = 'cdb_dataservices_server' + AND proname = 'obs_getavailabledenominators' + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text'); + exists +-------- + t +(1 row) + +SELECT exists(SELECT * + FROM pg_proc p + 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'); + exists +-------- + t +(1 row) + +SELECT exists(SELECT * + FROM pg_proc p + INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) + WHERE ns.nspname = 'cdb_dataservices_server' + AND proname = 'obs_getavailabletimespans' + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text'); + exists +-------- + t +(1 row) + +SELECT exists(SELECT * + FROM pg_proc p + INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) + WHERE ns.nspname = 'cdb_dataservices_server' + AND proname = 'obs_legacybuildermetadata' + AND oidvectortypes(p.proargtypes) = 'text, text, text'); + exists +-------- + t +(1 row) + diff --git a/server/extension/test/sql/100_data_observatory_test.sql b/server/extension/test/sql/100_data_observatory_test.sql index c865d17..945448d 100644 --- a/server/extension/test/sql/100_data_observatory_test.sql +++ b/server/extension/test/sql/100_data_observatory_test.sql @@ -115,4 +115,39 @@ SELECT exists(SELECT * INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' AND proname = 'obs_getpointsbypointandradius' - AND oidvectortypes(p.proargtypes) = 'text, text, geometry, numeric, text, text, text'); \ No newline at end of file + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, numeric, text, text, text'); + +SELECT exists(SELECT * + FROM pg_proc p + INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) + WHERE ns.nspname = 'cdb_dataservices_server' + AND proname = 'obs_getavailablenumerators' + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text'); + +SELECT exists(SELECT * + FROM pg_proc p + INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) + WHERE ns.nspname = 'cdb_dataservices_server' + AND proname = 'obs_getavailabledenominators' + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text'); + +SELECT exists(SELECT * + FROM pg_proc p + 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'); + +SELECT exists(SELECT * + FROM pg_proc p + INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) + WHERE ns.nspname = 'cdb_dataservices_server' + AND proname = 'obs_getavailabletimespans' + AND oidvectortypes(p.proargtypes) = 'text, text, geometry, text[], text, text, text'); + +SELECT exists(SELECT * + FROM pg_proc p + INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) + WHERE ns.nspname = 'cdb_dataservices_server' + AND proname = 'obs_legacybuildermetadata' + AND oidvectortypes(p.proargtypes) = 'text, text, text'); From b392eaf74b1ba528142cea52d3c0b63e01b5dd75 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Thu, 10 Nov 2016 16:00:25 +0100 Subject: [PATCH 7/7] removed manual call to here geocoder --- test/integration/test_street_functions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/test_street_functions.py b/test/integration/test_street_functions.py index 0672425..47dd2b4 100644 --- a/test/integration/test_street_functions.py +++ b/test/integration/test_street_functions.py @@ -15,8 +15,8 @@ class TestStreetFunctions(TestCase): self.env_variables['api_key'] ) - def test_if_select_with_here_street_point_is_ok(self): - query = "SELECT cdb_here_geocode_street_point(street) " \ + def test_if_select_with_street_point_is_ok(self): + query = "SELECT cdb_geocode_street_point(street) " \ "as geometry FROM {0} LIMIT 1&api_key={1}".format( self.env_variables['table_name'], self.env_variables['api_key'])