From eb31a8f40a5c9ae00dde57cbc76a13e845fb08c1 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Thu, 19 Apr 2018 19:51:30 +0200 Subject: [PATCH] Remove new fields not used to simplify deploy process --- release/observatory--1.9.0.sql | 8 ++------ src/pg/sql/42_observatory_exploration.sql | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/release/observatory--1.9.0.sql b/release/observatory--1.9.0.sql index d69d20b..eef2b90 100644 --- a/release/observatory--1.9.0.sql +++ b/release/observatory--1.9.0.sql @@ -1830,9 +1830,7 @@ CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetAvailableTimespans( timespan_tags JSONB, valid_numer BOOLEAN, valid_denom BOOLEAN, - valid_geom BOOLEAN, - timespan_alias TEXT, - timespan_range DATERANGE + valid_geom BOOLEAN ) AS $$ DECLARE geom_clause TEXT; @@ -1861,9 +1859,7 @@ BEGIN NULL::JSONB timespan_tags, COALESCE($1 = ANY(numers), false) valid_numer, COALESCE($2 = ANY(denoms), false) valid_denom, - COALESCE($3 = ANY(geoms), false) valid_geom_id, - timespan_alias::TEXT, - timespan_range::DATERANGE + COALESCE($3 = ANY(geoms), false) valid_geom_id FROM observatory.obs_meta_timespan WHERE %s (timespan_tags ?& $4 OR CARDINALITY($4) = 0) $string$, geom_clause) diff --git a/src/pg/sql/42_observatory_exploration.sql b/src/pg/sql/42_observatory_exploration.sql index 9cce2d7..c63241a 100644 --- a/src/pg/sql/42_observatory_exploration.sql +++ b/src/pg/sql/42_observatory_exploration.sql @@ -424,9 +424,7 @@ CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetAvailableTimespans( timespan_tags JSONB, valid_numer BOOLEAN, valid_denom BOOLEAN, - valid_geom BOOLEAN, - timespan_alias TEXT, - timespan_range DATERANGE + valid_geom BOOLEAN ) AS $$ DECLARE geom_clause TEXT; @@ -455,9 +453,7 @@ BEGIN NULL::JSONB timespan_tags, COALESCE($1 = ANY(numers), false) valid_numer, COALESCE($2 = ANY(denoms), false) valid_denom, - COALESCE($3 = ANY(geoms), false) valid_geom_id, - timespan_alias::TEXT, - timespan_range::DATERANGE + COALESCE($3 = ANY(geoms), false) valid_geom_id FROM observatory.obs_meta_timespan WHERE %s (timespan_tags ?& $4 OR CARDINALITY($4) = 0) $string$, geom_clause)