From dfaa037475a5ec85cea24e0bfcc5ced1ae28da65 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Fri, 11 Nov 2016 17:53:20 +0100 Subject: [PATCH 1/4] Server init new version 0.18.1 --- server/extension/cdb_dataservices_server--0.18.0--0.18.1.sql | 5 +++++ server/extension/cdb_dataservices_server--0.18.1--0.18.0.sql | 5 +++++ server/extension/cdb_dataservices_server.control | 2 +- .../cdb_dataservices_server--0.17.0--0.18.0.sql | 0 .../cdb_dataservices_server--0.18.0--0.17.0.sql | 0 .../{ => old_versions}/cdb_dataservices_server--0.18.0.sql | 0 6 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 server/extension/cdb_dataservices_server--0.18.0--0.18.1.sql create mode 100644 server/extension/cdb_dataservices_server--0.18.1--0.18.0.sql rename server/extension/{ => old_versions}/cdb_dataservices_server--0.17.0--0.18.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.18.0--0.17.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.18.0.sql (100%) diff --git a/server/extension/cdb_dataservices_server--0.18.0--0.18.1.sql b/server/extension/cdb_dataservices_server--0.18.0--0.18.1.sql new file mode 100644 index 0000000..d21e33c --- /dev/null +++ b/server/extension/cdb_dataservices_server--0.18.0--0.18.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_server UPDATE TO '0.18.1'" 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.1--0.18.0.sql b/server/extension/cdb_dataservices_server--0.18.1--0.18.0.sql new file mode 100644 index 0000000..cc7ce4b --- /dev/null +++ b/server/extension/cdb_dataservices_server--0.18.1--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.control b/server/extension/cdb_dataservices_server.control index 1e6bfa5..de830ac 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.18.0' +default_version = '0.18.1' requires = 'plpythonu, plproxy, postgis, cdb_geocoder' superuser = true schema = cdb_dataservices_server diff --git a/server/extension/cdb_dataservices_server--0.17.0--0.18.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.17.0--0.18.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.17.0--0.18.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.17.0--0.18.0.sql diff --git a/server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.18.0--0.17.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.18.0--0.17.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.18.0--0.17.0.sql diff --git a/server/extension/cdb_dataservices_server--0.18.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.18.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.18.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.18.0.sql From 25cd40164a56faa56b0c44f2cf938cc42dfeae93 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Fri, 11 Nov 2016 17:55:35 +0100 Subject: [PATCH 2/4] Client init new version 0.12.1 --- client/cdb_dataservices_client--0.12.0--0.12.1.sql | 5 +++++ client/cdb_dataservices_client--0.12.1--0.12.0.sql | 5 +++++ client/cdb_dataservices_client.control | 2 +- .../cdb_dataservices_client--0.11.1--0.12.0.sql | 0 .../cdb_dataservices_client--0.12.0--0.11.1.sql | 0 .../{ => old_versions}/cdb_dataservices_client--0.12.0.sql | 0 6 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 client/cdb_dataservices_client--0.12.0--0.12.1.sql create mode 100644 client/cdb_dataservices_client--0.12.1--0.12.0.sql rename client/{ => old_versions}/cdb_dataservices_client--0.11.1--0.12.0.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.12.0--0.11.1.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.12.0.sql (100%) diff --git a/client/cdb_dataservices_client--0.12.0--0.12.1.sql b/client/cdb_dataservices_client--0.12.0--0.12.1.sql new file mode 100644 index 0000000..404fb71 --- /dev/null +++ b/client/cdb_dataservices_client--0.12.0--0.12.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.12.1'" to load this file. \quit + +-- HERE goes your code to upgrade/downgrade diff --git a/client/cdb_dataservices_client--0.12.1--0.12.0.sql b/client/cdb_dataservices_client--0.12.1--0.12.0.sql new file mode 100644 index 0000000..126503e --- /dev/null +++ b/client/cdb_dataservices_client--0.12.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.control b/client/cdb_dataservices_client.control index 6b2732a..c8e9be8 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.12.0' +default_version = '0.12.1' requires = 'plproxy, cartodb' superuser = true schema = cdb_dataservices_client diff --git a/client/cdb_dataservices_client--0.11.1--0.12.0.sql b/client/old_versions/cdb_dataservices_client--0.11.1--0.12.0.sql similarity index 100% rename from client/cdb_dataservices_client--0.11.1--0.12.0.sql rename to client/old_versions/cdb_dataservices_client--0.11.1--0.12.0.sql diff --git a/client/cdb_dataservices_client--0.12.0--0.11.1.sql b/client/old_versions/cdb_dataservices_client--0.12.0--0.11.1.sql similarity index 100% rename from client/cdb_dataservices_client--0.12.0--0.11.1.sql rename to client/old_versions/cdb_dataservices_client--0.12.0--0.11.1.sql diff --git a/client/cdb_dataservices_client--0.12.0.sql b/client/old_versions/cdb_dataservices_client--0.12.0.sql similarity index 100% rename from client/cdb_dataservices_client--0.12.0.sql rename to client/old_versions/cdb_dataservices_client--0.12.0.sql From 8396eae733478d840a1f90e09772c4e90f0db607 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Fri, 11 Nov 2016 18:13:01 +0100 Subject: [PATCH 3/4] Server update to type obs_meta_geometry with new types --- .../cdb_dataservices_server--0.18.0--0.18.1.sql | 9 ++++++++- .../cdb_dataservices_server--0.18.1--0.18.0.sql | 9 ++++++++- server/extension/sql/130_data_observatory_helper.sql | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/server/extension/cdb_dataservices_server--0.18.0--0.18.1.sql b/server/extension/cdb_dataservices_server--0.18.0--0.18.1.sql index d21e33c..67b2e24 100644 --- a/server/extension/cdb_dataservices_server--0.18.0--0.18.1.sql +++ b/server/extension/cdb_dataservices_server--0.18.0--0.18.1.sql @@ -2,4 +2,11 @@ -- Complain if script is sourced in psql, rather than via CREATE EXTENSION \echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.18.1'" to load this file. \quit --- HERE goes your code to upgrade/downgrade \ No newline at end of file +-- HERE goes your code to upgrade/downgrade +ALTER TYPE cdb_dataservices_server.obs_meta_geometry ADD ATTRIBUTE score numeric; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry ADD ATTRIBUTE numtiles bigint; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry ADD ATTRIBUTE notnull_percent numeric; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry ADD ATTRIBUTE numgeoms numeric; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry ADD ATTRIBUTE percentfill numeric; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry ADD ATTRIBUTE estnumgeoms numeric; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry ADD ATTRIBUTE meanmediansize numeric; diff --git a/server/extension/cdb_dataservices_server--0.18.1--0.18.0.sql b/server/extension/cdb_dataservices_server--0.18.1--0.18.0.sql index cc7ce4b..5f21a8a 100644 --- a/server/extension/cdb_dataservices_server--0.18.1--0.18.0.sql +++ b/server/extension/cdb_dataservices_server--0.18.1--0.18.0.sql @@ -2,4 +2,11 @@ -- 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 +-- HERE goes your code to upgrade/downgrade +ALTER TYPE cdb_dataservices_server.obs_meta_geometry DROP ATTRIBUTE score; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry DROP ATTRIBUTE numtiles; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry DROP ATTRIBUTE notnull_percent; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry DROP ATTRIBUTE numgeoms; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry DROP ATTRIBUTE percentfill; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry DROP ATTRIBUTE estnumgeoms; +ALTER TYPE cdb_dataservices_server.obs_meta_geometry DROP ATTRIBUTE meanmediansize; diff --git a/server/extension/sql/130_data_observatory_helper.sql b/server/extension/sql/130_data_observatory_helper.sql index 384547e..b75563a 100644 --- a/server/extension/sql/130_data_observatory_helper.sql +++ b/server/extension/sql/130_data_observatory_helper.sql @@ -35,7 +35,7 @@ RETURNS SETOF cdb_dataservices_server.obs_meta_denominator AS $$ 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 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, score numeric, numtiles bigint, notnull_percent numeric, numgeoms numeric, percentfill numeric, estnumgeoms numeric, meanmediansize numeric); CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableGeometries( username TEXT, From 7f963d2f7a40c27b824f54bbd8f256f1f8ab7564 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Fri, 11 Nov 2016 18:13:35 +0100 Subject: [PATCH 4/4] Client update to type obs_meta_geometry with new types --- client/cdb_dataservices_client--0.12.0--0.12.1.sql | 7 +++++++ client/cdb_dataservices_client--0.12.1--0.12.0.sql | 7 +++++++ client/sql/16_custom_types.sql | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/client/cdb_dataservices_client--0.12.0--0.12.1.sql b/client/cdb_dataservices_client--0.12.0--0.12.1.sql index 404fb71..8c5522c 100644 --- a/client/cdb_dataservices_client--0.12.0--0.12.1.sql +++ b/client/cdb_dataservices_client--0.12.0--0.12.1.sql @@ -3,3 +3,10 @@ \echo Use "ALTER EXTENSION cdb_dataservices_client UPDATE TO '0.12.1'" to load this file. \quit -- HERE goes your code to upgrade/downgrade +ALTER TYPE cdb_dataservices_client.obs_meta_geometry ADD ATTRIBUTE score numeric; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry ADD ATTRIBUTE numtiles bigint; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry ADD ATTRIBUTE notnull_percent numeric; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry ADD ATTRIBUTE numgeoms numeric; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry ADD ATTRIBUTE percentfill numeric; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry ADD ATTRIBUTE estnumgeoms numeric; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry ADD ATTRIBUTE meanmediansize numeric; diff --git a/client/cdb_dataservices_client--0.12.1--0.12.0.sql b/client/cdb_dataservices_client--0.12.1--0.12.0.sql index 126503e..c214e61 100644 --- a/client/cdb_dataservices_client--0.12.1--0.12.0.sql +++ b/client/cdb_dataservices_client--0.12.1--0.12.0.sql @@ -3,3 +3,10 @@ \echo Use "ALTER EXTENSION cdb_dataservices_client UPDATE TO '0.12.0'" to load this file. \quit -- HERE goes your code to upgrade/downgrade +ALTER TYPE cdb_dataservices_client.obs_meta_geometry DROP ATTRIBUTE score; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry DROP ATTRIBUTE numtiles; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry DROP ATTRIBUTE notnull_percent; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry DROP ATTRIBUTE numgeoms; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry DROP ATTRIBUTE percentfill; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry DROP ATTRIBUTE estnumgeoms; +ALTER TYPE cdb_dataservices_client.obs_meta_geometry DROP ATTRIBUTE meanmediansize; diff --git a/client/sql/16_custom_types.sql b/client/sql/16_custom_types.sql index 9f26b97..0bb19a2 100644 --- a/client/sql/16_custom_types.sql +++ b/client/sql/16_custom_types.sql @@ -15,6 +15,6 @@ CREATE TYPE cdb_dataservices_client.obs_meta_numerator AS (numer_id text, numer_ 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_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, score numeric, numtiles bigint, notnull_percent numeric, numgeoms numeric, percentfill numeric, estnumgeoms numeric, meanmediansize numeric); 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);