Fix server script

client/cdb_dataservices_client--0.30.0--0.31.0.sql

@@ -177,10 +177,11 @@ DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_geometry;
 DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_timespan;
 DROP TYPE IF EXISTS cdb_dataservices_client.ds_fdw_metadata;
 DROP TYPE IF EXISTS cdb_dataservices_client.ds_return_metadata;
-DROP TYPE IF EXISTS cdb_dataservices_client.service_type;
 
-CREATE TYPE cdb_dataservices_client.service_type AS ENUM (
+DELETE FROM pg_enum
-    'isolines',
+WHERE enumlabel = 'observatory'
-    'hires_geocoder',
+AND enumtypid = (
-    'routing'
+  SELECT pg_type.oid
+  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'
 );

client/cdb_dataservices_client--0.31.0--0.30.0.sql

@@ -12,13 +12,7 @@ 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);
 
-DROP TYPE IF EXISTS cdb_dataservices_client.service_type; 
+ALTER TYPE cdb_dataservices_client.service_type ADD VALUE 'observatory' AFTER 'routing';
-CREATE TYPE cdb_dataservices_client.service_type AS ENUM (
-    'isolines',
-    'hires_geocoder',
-    'routing',
-    'observatory'
-);
 
 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 $$

server/extension/cdb_dataservices_server--0.39.3--0.40.0.sql

@@ -65,18 +65,12 @@ DROP FUNCTION IF EXISTS cdb_dataservices_server.OBS_LegacyBuilderMetadata(TEXT,
 DROP FUNCTION IF EXISTS cdb_dataservices_server._OBS_GetNumerators (TEXT, TEXT, geometry(Geometry, 4326), TEXT[], TEXT[] , TEXT[], TEXT[] , TEXT, TEXT, TEXT, TEXT);
 DROP FUNCTION IF EXISTS cdb_dataservices_server._get_obs_config(TEXT, TEXT);
 
-DROP TYPE IF EXISTS cdb_dataservices_client.ds_fdw_metadata;
+DELETE FROM pg_enum
-DROP TYPE IF EXISTS cdb_dataservices_client.ds_return_metadata;
+WHERE enumlabel = 'observatory'
-DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_numerator;
+AND enumtypid = (
-DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_denominator;
+  SELECT pg_type.oid
-DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_geometry;
+  FROM pg_type INNER JOIN pg_namespace ON (pg_type.typnamespace = pg_namespace.oid)
-DROP TYPE IF EXISTS cdb_dataservices_client.obs_meta_timespan;
+  WHERE pg_type.typname = 'service_type' AND pg_namespace.nspname = 'cdb_dataservices_server'
-DROP TYPE IF EXISTS cdb_dataservices_client.service_type;
-
-CREATE TYPE cdb_dataservices_server.service_type AS ENUM (
-    'isolines',
-    'hires_geocoder',
-    'routing'
 );
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_service_quota_info(

server/extension/cdb_dataservices_server--0.40.0--0.39.3.sql

@@ -1446,13 +1446,7 @@ RETURNS boolean AS $$
     return True
 $$ LANGUAGE @@plpythonu@@ SECURITY DEFINER STABLE PARALLEL RESTRICTED;
 
-DROP TYPE IF EXISTS cdb_dataservices_client.service_type;
+ALTER TYPE cdb_dataservices_server.service_type ADD VALUE 'observatory' AFTER 'routing';
-CREATE TYPE cdb_dataservices_server.service_type AS ENUM (
-    'isolines',
-    'hires_geocoder',
-    'routing',
-    'observatory'
-);
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_service_quota_info(
   username TEXT,