cartodb4/observatory-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #331 from CartoDB/remove_new_fields

Browse Source 
Remove new fields not used to simplify deploy process
This commit is contained in:
Mario de Frutos 2018-04-20 10:13:07 +02:00 committed by GitHub
commit 19c5b09f2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/observatory--1.9.0.sql
View File

@ -1830,9 +1830,7 @@ CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetAvailableTimespans(
timespan_tags JSONB, timespan_tags JSONB,
valid_numer BOOLEAN, valid_numer BOOLEAN,
valid_denom BOOLEAN, valid_denom BOOLEAN,
valid_geom BOOLEAN, valid_geom BOOLEAN
timespan_alias TEXT,
timespan_range DATERANGE
) AS $$ ) AS $$
DECLARE DECLARE
geom_clause TEXT; geom_clause TEXT;
@ -1861,9 +1859,7 @@ BEGIN
NULL::JSONB timespan_tags, NULL::JSONB timespan_tags,
COALESCE($1 = ANY(numers), false) valid_numer, COALESCE($1 = ANY(numers), false) valid_numer,
COALESCE($2 = ANY(denoms), false) valid_denom, COALESCE($2 = ANY(denoms), false) valid_denom,
COALESCE($3 = ANY(geoms), false) valid_geom_id, COALESCE($3 = ANY(geoms), false) valid_geom_id
timespan_alias::TEXT,
timespan_range::DATERANGE
FROM observatory.obs_meta_timespan FROM observatory.obs_meta_timespan
WHERE %s (timespan_tags ?& $4 OR CARDINALITY($4) = 0) WHERE %s (timespan_tags ?& $4 OR CARDINALITY($4) = 0)
$string$, geom_clause) $string$, geom_clause)

8
src/pg/sql/42_observatory_exploration.sql
View File

@ -424,9 +424,7 @@ CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetAvailableTimespans(
timespan_tags JSONB, timespan_tags JSONB,
valid_numer BOOLEAN, valid_numer BOOLEAN,
valid_denom BOOLEAN, valid_denom BOOLEAN,
valid_geom BOOLEAN, valid_geom BOOLEAN
timespan_alias TEXT,
timespan_range DATERANGE
) AS $$ ) AS $$
DECLARE DECLARE
geom_clause TEXT; geom_clause TEXT;
@ -455,9 +453,7 @@ BEGIN
NULL::JSONB timespan_tags, NULL::JSONB timespan_tags,
COALESCE($1 = ANY(numers), false) valid_numer, COALESCE($1 = ANY(numers), false) valid_numer,
COALESCE($2 = ANY(denoms), false) valid_denom, COALESCE($2 = ANY(denoms), false) valid_denom,
COALESCE($3 = ANY(geoms), false) valid_geom_id, COALESCE($3 = ANY(geoms), false) valid_geom_id
timespan_alias::TEXT,
timespan_range::DATERANGE
FROM observatory.obs_meta_timespan FROM observatory.obs_meta_timespan
WHERE %s (timespan_tags ?& $4 OR CARDINALITY($4) = 0) WHERE %s (timespan_tags ?& $4 OR CARDINALITY($4) = 0)
$string$, geom_clause) $string$, geom_clause)