From 08debb83edec791522e7a7fc392690b097268d0a Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Thu, 10 Nov 2016 18:08:35 +0100 Subject: [PATCH] Server side change JSONB to JSON in the legacybuildermedatada function --- server/extension/cdb_dataservices_server--0.17.0--0.18.0.sql | 2 +- server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql | 2 +- server/extension/cdb_dataservices_server--0.18.0.sql | 2 +- server/extension/sql/130_data_observatory_helper.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 index ed80423..baafa90 100644 --- 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 @@ -67,7 +67,7 @@ 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 $$ +RETURNS TABLE(name TEXT, subsection JSON) 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/cdb_dataservices_server--0.18.0--0.17.0.sql b/server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql index 86fb426..04880be 100644 --- 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 @@ -7,7 +7,7 @@ DROP FUNCTION IF EXISTS cdb_dataservices_server.obs_getavailablenumerators(TEXT, DROP FUNCTION IF EXISTS cdb_dataservices_server.obs_getavailabledenominators(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT); DROP FUNCTION IF EXISTS cdb_dataservices_server.obs_getavailablegeometries(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT); DROP FUNCTION IF EXISTS cdb_dataservices_server.obs_getavailabletimespans(TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT, TEXT, TEXT); -DROP FUNCTION IF EXISTS cdb_dataservices_server.obs_legacybuildermetadata(TEXT); +DROP FUNCTION IF EXISTS cdb_dataservices_server.obs_legacybuildermetadata(TEXT, TEXT, TEXT); DROP TYPE IF EXISTS cdb_dataservices_server.obs_meta_numerator; DROP TYPE IF EXISTS cdb_dataservices_server.obs_meta_denominator; diff --git a/server/extension/cdb_dataservices_server--0.18.0.sql b/server/extension/cdb_dataservices_server--0.18.0.sql index e73b2b5..e6c5866 100644 --- a/server/extension/cdb_dataservices_server--0.18.0.sql +++ b/server/extension/cdb_dataservices_server--0.18.0.sql @@ -1329,7 +1329,7 @@ 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 $$ +RETURNS TABLE(name TEXT, subsection JSON) 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/sql/130_data_observatory_helper.sql b/server/extension/sql/130_data_observatory_helper.sql index 20c0d0c..384547e 100644 --- a/server/extension/sql/130_data_observatory_helper.sql +++ b/server/extension/sql/130_data_observatory_helper.sql @@ -69,7 +69,7 @@ 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 $$ +RETURNS TABLE(name TEXT, subsection JSON) AS $$ CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname); SELECT * FROM cdb_observatory.OBS_LegacyBuilderMetadata(aggregate_type); $$ LANGUAGE plproxy;