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

bring back lost obs_getcolumndata work from 94169e6874f2a79f2b6ed4d58ad0fd542a4ec64e

Browse Source
This commit is contained in:
John Krauss 2016-04-13 14:07:28 -04:00
parent ea183c7447
commit 38a784b15c
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pg/sql/40_observatory_utility.sql
View File

@ -56,15 +56,17 @@ BEGIN
WHERE c2c.reltype = ''geom_ref'' WHERE c2c.reltype = ''geom_ref''
AND c2c.target_id = $1 AND c2c.target_id = $1
AND c2c.source_id = t.column_id AND c2c.source_id = t.column_id
),
column_ids as (
select row_number() over () as no, a.column_id as column_id from (select unnest($2) as column_id) a
) )
SELECT array_agg(ROW(colname, tablename, aggregate)::OBS_ColumnData order by column_id) SELECT array_agg(ROW(colname, tablename, aggregate)::OBS_ColumnData order by column_ids.no)
FROM observatory.OBS_column c, observatory.OBS_column_table ct, observatory.OBS_table t FROM column_ids, observatory.OBS_column c, observatory.OBS_column_table ct, observatory.OBS_table t
WHERE c.id = ct.column_id WHERE column_ids.column_id = c.id
AND c.id = ct.column_id
AND t.id = ct.table_id AND t.id = ct.table_id
AND Array[c.id] <@ $2
AND t.timespan = $3 AND t.timespan = $3
AND t.id in (SELECT id FROM geomref) AND t.id in (SELECT id FROM geomref)
' '
USING geometry_id, column_ids, timespan USING geometry_id, column_ids, timespan
INTO result; INTO result;
@ -86,7 +88,17 @@ DECLARE
column_id text; column_id text;
result text; result text;
BEGIN BEGIN
EXECUTE format('select array_agg(column_id) from observatory.OBS_column_table where Array[colname] <@ $1 and table_id = %L limit 1', table_name) EXECUTE format('
WITH col_names AS (
select row_number() over() as no, a.column_name as column_name from(
select unnest($1) as column_name
) a
)
select array_agg(column_id order by col_names.no)
FROM observatory.OBS_column_table,col_names
where colname = col_names.column_name
and table_id = %L limit 1
', table_name)
INTO result INTO result
using column_names; using column_names;
RETURN result; RETURN result;

4
src/pg/sql/41_observatory_augmentation.sql
View File

@ -245,8 +245,8 @@ BEGIN
ids := OBS_LookupCensusHuman(dimension_names); ids := OBS_LookupCensusHuman(dimension_names);
RETURN QUERY SELECT names, vals RETURN QUERY
FROM OBS_Get(geom, ids, time_span, geometry_level); SELECT names, vals FROM OBS_Get(geom, ids, time_span, geometry_level);
END; END;
$$ LANGUAGE plpgsql; $$ LANGUAGE plpgsql;