From 1bcfa30938ce7955d939e8e9808af7cc6c667979 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Thu, 30 Nov 2017 13:08:26 +0100 Subject: [PATCH] Remove type creation from downgrade script --- ...db_dataservices_server--0.29.0--0.28.0.sql | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/server/extension/cdb_dataservices_server--0.29.0--0.28.0.sql b/server/extension/cdb_dataservices_server--0.29.0--0.28.0.sql index 9f19841..ee4bb7e 100644 --- a/server/extension/cdb_dataservices_server--0.29.0--0.28.0.sql +++ b/server/extension/cdb_dataservices_server--0.29.0--0.28.0.sql @@ -4,11 +4,6 @@ -- HERE goes your code to upgrade/downgrade--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES -CREATE TYPE cdb_dataservices_server.simple_route AS ( - shape geometry(LineString,4326), - length real, - duration integer -); CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapzen_route_with_waypoints( username TEXT, @@ -1441,9 +1436,6 @@ RETURNS TABLE(the_geom geometry, geom_refs text) AS $$ finally: quota_service.increment_total_service_use() $$ LANGUAGE plpythonu; -CREATE TYPE cdb_dataservices_server.ds_fdw_metadata as (schemaname text, tabname text, servername text); - -CREATE TYPE cdb_dataservices_server.ds_return_metadata as (colnames text[], coltypes text[]); CREATE OR REPLACE FUNCTION cdb_dataservices_server._DST_ConnectUserTable(username text, orgname text, user_db_role text, input_schema text, dbname text, table_name text) RETURNS cdb_dataservices_server.ds_fdw_metadata AS $$ @@ -1483,8 +1475,6 @@ RETURNS text AS $$ 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, @@ -1516,7 +1506,6 @@ RETURNS SETOF cdb_dataservices_server.obs_meta_numerator AS $$ SELECT * FROM cdb_observatory._OBS_GetNumerators(bounds, section_tags, subsection_tags, other_tags, ids, name, 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, @@ -1531,7 +1520,6 @@ 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, 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 OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableGeometries( username TEXT, @@ -1547,7 +1535,6 @@ RETURNS SETOF cdb_dataservices_server.obs_meta_geometry AS $$ SELECT * FROM cdb_observatory.OBS_GetAvailableGeometries(bounds, filter_tags, numer_id, denom_id, timespan, number_geometries); $$ 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, timespan_type text, timespan_extra jsonb, timespan_tags jsonb); CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_GetAvailableTimespans( username TEXT, @@ -1689,30 +1676,7 @@ RETURNS boolean AS $$ GD[cache_key] = obs_config return True $$ LANGUAGE plpythonu SECURITY DEFINER; -DO $$ -BEGIN - IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'service_type') THEN - CREATE TYPE cdb_dataservices_server.service_type AS ENUM ( - 'isolines', - 'hires_geocoder', - 'routing', - 'observatory' - ); - END IF; -END $$; -DO $$ -BEGIN - IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'service_quota_info') THEN - CREATE TYPE cdb_dataservices_server.service_quota_info AS ( - service cdb_dataservices_server.service_type, - monthly_quota NUMERIC, - used_quota NUMERIC, - soft_limit BOOLEAN, - provider TEXT - ); - END IF; -END $$; CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_service_quota_info( username TEXT, @@ -2757,7 +2721,6 @@ RETURNS Geometry AS $$ RETURN ret; END $$ LANGUAGE plpgsql; -CREATE TYPE cdb_dataservices_server.isoline AS (center geometry(Geometry,4326), data_range integer, the_geom geometry(Multipolygon,4326)); CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_routing_isolines(username TEXT, orgname TEXT, type TEXT, source geometry(Geometry, 4326), mode TEXT, data_range integer[], options text[]) RETURNS SETOF cdb_dataservices_server.isoline AS $$