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

Use explicit functions for query construction and metadata

Browse Source
This commit is contained in:
Carla Iriberri 2016-08-18 15:36:32 +02:00
parent 8785639ece
commit 26b22a9bf4
1 changed files with 77 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/pg/sql/50_table_level_functions.sql
View File

@ -37,26 +37,34 @@ AS $$
DECLARE DECLARE
colnames text[]; colnames text[];
coltypes text[]; coltypes text[];
requested_measures text[];
measure text;
BEGIN BEGIN
IF $3 ILIKE 'OBS_GetMeasure' THEN
-- Simple mock, there should be real logic in here. SELECT r.colnames::text[], r.coltypes::text[] INTO colnames, coltypes
FROM cdb_observatory._OBS_GetMeasureResultMetadata(params) r
IF $3 NOT ILIKE 'GetMeasure' OR $3 IS NULL THEN LIMIT 1;
RAISE 'This function is not supported yet: %', $3; ELSE
RAISE 'This function is not supported yet: %', $3;
END IF; END IF;
RETURN (colnames::text[], coltypes::text[]);
END;
$$ LANGUAGE plpgsql;
SELECT translate($4::json->>'tag_name','[]', '{}')::text[] INTO requested_measures; CREATE OR REPLACE FUNCTION cdb_observatory._OBS_GetMeasureResultMetadata(params json)
RETURNS cdb_observatory.ds_return_metadata
AS $$
DECLARE
colnames text[]; -- Array to store the name of the measures to be returned
coltypes text[]; -- Array to store the type of the measures to be returned
requested_measures text[];
measure_id text;
BEGIN
-- By definition, all the measure results for the OBS_GetMeasure API are numeric values
SELECT translate($1::json->>'measure_id','[]', '{}')::text[] INTO requested_measures;
FOREACH measure IN ARRAY requested_measures FOREACH measure_id IN ARRAY requested_measures
LOOP LOOP
IF NOT measure ILIKE ANY (Array['total_pop', 'pop_16_over']::text[]) THEN SELECT array_append(colnames, measure_id) INTO colnames;
RAISE 'This measure is not supported yet: %', measure; SELECT array_append(coltypes, 'numeric'::text) INTO coltypes;
END IF;
SELECT array_append(colnames, measure) INTO colnames;
SELECT array_append(coltypes, 'double precision'::text) INTO coltypes;
END LOOP; END LOOP;
RETURN (colnames::text[], coltypes::text[]); RETURN (colnames::text[], coltypes::text[]);
@ -68,45 +76,71 @@ RETURNS SETOF record
AS $$ AS $$
DECLARE DECLARE
data_query text; data_query text;
tag_name text[];
tag text;
tags_list text;
tags_query text;
rec RECORD; rec RECORD;
BEGIN BEGIN
SELECT translate($6::json->>'tag_name','[]', '{}')::text[] INTO tag_name; SELECT cdb_observatory._OBS_GetMeasureQuery(table_schema, table_name, params) INTO data_query;
SELECT array_to_string(tag_name, ',') INTO tags_list;
tags_query := '';
FOREACH tag IN ARRAY tag_name
LOOP
SELECT tags_query || ' sum(' || tag || '/fraction)::double precision as ' || tag || ', ' INTO tags_query;
END LOOP;
-- Simple mock, there should be real logic in here.
data_query := '(WITH _areas AS(SELECT ST_Area(a.the_geom::geography)'
|| '/ (1000 * 1000) as fraction, a.geoid, b.cartodb_id FROM '
|| 'observatory.obs_c6fb99c47d61289fbb8e561ff7773799d3fcc308 as a, '
|| table_schema || '.' || table_name || ' AS b '
|| 'WHERE b.the_geom && a.the_geom ), values AS (SELECT geoid, '
|| tags_list
|| ' FROM observatory.obs_1a098da56badf5f32e336002b0a81708c40d29cd ) '
|| 'SELECT '
|| tags_query
|| ' cartodb_id::int FROM _areas, values '
|| 'WHERE values.geoid = _areas.geoid GROUP BY cartodb_id);';
FOR rec IN EXECUTE data_query FOR rec IN EXECUTE data_query
LOOP LOOP
RETURN NEXT rec; RETURN NEXT rec;
END LOOP; END LOOP;
RETURN; RETURN;
END; END;
$$ LANGUAGE plpgsql SECURITY DEFINER; $$ LANGUAGE plpgsql SECURITY DEFINER;
CREATE OR REPLACE FUNCTION cdb_observatory._OBS_GetMeasureQuery(table_schema text, table_name text, params json)
RETURNS text
AS $$
DECLARE
data_query text;
measure_ids_arr text[];
measure_id text;
measures_list text;
measures_query text;
normalize text;
boundary_id text;
time_span text;
geom_table_name text;
data_table_name text;
BEGIN
measures_query := '';
-- SELECT table_name from obs_meta WHERE boundary_id = {bound} AND [...] INTO geom_table_name
geom_table_name := 'observatory.obs_c6fb99c47d61289fbb8e561ff7773799d3fcc308';
-- SELECT table_name from obs_meta WHERE time_span = {time} AND [...] INTO data_table_name
data_table_name := 'observatory.obs_1a098da56badf5f32e336002b0a81708c40d29cd';
-- Get measure_ids array from JSON
SELECT translate($3::json->>'measure_id','[]', '{}')::text[] INTO measure_ids_arr;
-- Get a comma-separated list of measures ("total_pop, over_16_pop") to be used in SELECTs
SELECT array_to_string(measure_ids_arr, ',') INTO measures_list;
FOREACH measure_id IN ARRAY measure_ids_arr
LOOP
-- Build query to compute each value and normalize
-- Assumes the default normalization method, the normalize parameter given in the JSON
-- should be checked in order to build the final query
SELECT measures_query || ' sum(' || measure_id || '/fraction)::numeric as ' || measure_id || ', ' INTO measures_query;
END LOOP;
-- Data query should select the measures and the cartodb_id of the user table, in that order.
data_query := '(WITH _areas AS(SELECT ST_Area(a.the_geom::geography)'
|| '/ (1000 * 1000) as fraction, a.geoid, b.cartodb_id FROM '
|| geom_table_name || ' as a, '
|| table_schema || '.' || table_name || ' AS b '
|| 'WHERE b.the_geom && a.the_geom ), values AS (SELECT geoid, '
|| measures_list
|| ' FROM ' || data_table_name || ' ) '
|| 'SELECT '
|| measures_query
|| ' cartodb_id::int FROM _areas, values '
|| 'WHERE values.geoid = _areas.geoid GROUP BY cartodb_id);';
RETURN data_query;
END;
$$ LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION cdb_observatory._OBS_DisconnectUserTable(username text, orgname text, table_schema text, table_name text, servername text) CREATE OR REPLACE FUNCTION cdb_observatory._OBS_DisconnectUserTable(username text, orgname text, table_schema text, table_name text, servername text)
RETURNS boolean RETURNS boolean
AS $$ AS $$