From f12e25117e6fca12b8f0a170701079c6ba91960b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 31 Mar 2021 15:58:30 +0200 Subject: [PATCH] Fix ALTER TYPE for multi-command string --- client/cdb_dataservices_client--0.31.0--0.30.0.sql | 8 +++++++- .../extension/cdb_dataservices_server--0.40.0--0.39.3.sql | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/client/cdb_dataservices_client--0.31.0--0.30.0.sql b/client/cdb_dataservices_client--0.31.0--0.30.0.sql index b2f52a6..9a006b7 100644 --- a/client/cdb_dataservices_client--0.31.0--0.30.0.sql +++ b/client/cdb_dataservices_client--0.31.0--0.30.0.sql @@ -12,7 +12,13 @@ CREATE TYPE cdb_dataservices_client.obs_meta_denominator AS (denom_id text, deno 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, geom_type text, geom_extra jsonb, geom_tags jsonb); 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, timespan_type text, timespan_extra jsonb, timespan_tags jsonb); -ALTER TYPE cdb_dataservices_client.service_type ADD VALUE 'observatory' AFTER 'routing'; +WITH c AS ( + SELECT pg_type.oid as id + FROM pg_type INNER JOIN pg_namespace ON (pg_type.typnamespace = pg_namespace.oid) + WHERE pg_type.typname = 'service_type' AND pg_namespace.nspname = 'cdb_dataservices_client' +) +INSERT INTO pg_enum (enumtypid, enumsortorder, enumlabel) +SELECT c.id, 4, 'observatory' FROM c; CREATE OR REPLACE FUNCTION cdb_dataservices_client.obs_get_demographic_snapshot (geom public.geometry(Geometry, 4326) ,time_span text DEFAULT '2009 - 2013'::text ,geometry_level text DEFAULT NULL) RETURNS json AS $$ diff --git a/server/extension/cdb_dataservices_server--0.40.0--0.39.3.sql b/server/extension/cdb_dataservices_server--0.40.0--0.39.3.sql index 29b8c87..65c94a2 100644 --- a/server/extension/cdb_dataservices_server--0.40.0--0.39.3.sql +++ b/server/extension/cdb_dataservices_server--0.40.0--0.39.3.sql @@ -1446,7 +1446,13 @@ RETURNS boolean AS $$ return True $$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED; -ALTER TYPE cdb_dataservices_server.service_type ADD VALUE 'observatory' AFTER 'routing'; +WITH c AS ( + SELECT pg_type.oid as id + FROM pg_type INNER JOIN pg_namespace ON (pg_type.typnamespace = pg_namespace.oid) + WHERE pg_type.typname = 'service_type' AND pg_namespace.nspname = 'cdb_dataservices_server' +) +INSERT INTO pg_enum (enumtypid, enumsortorder, enumlabel) +SELECT c.id, 4, 'observatory' FROM c; CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_service_quota_info( username TEXT,