diff --git a/src/pg/test/fixtures/obs_column_table.sql b/src/pg/test/fixtures/obs_column_table.sql index 17352fa..9c3216c 100644 --- a/src/pg/test/fixtures/obs_column_table.sql +++ b/src/pg/test/fixtures/obs_column_table.sql @@ -1816,4 +1816,4 @@ INSERT INTO obs_column_table (cartodb_id, the_geom, the_geom_webmercator, column INSERT INTO obs_column_table (cartodb_id, the_geom, the_geom_webmercator, column_id, table_id, colname, extra) VALUES (1812, NULL, NULL, '"us.census.acs".B19001017_quantile', '"us.census.acs".quantiles_puma_5yr_2013_e9f0d7bc6c', 'income_200000_or_more_quantile', NULL); CREATE SCHEMA IF NOT EXISTS observatory; -ALTER TABLE OBS_column_table SET SCHEMA observatory; \ No newline at end of file +ALTER TABLE OBS_column_table SET SCHEMA observatory; diff --git a/src/pg/test/sql/40_observatory_utility_test.sql b/src/pg/test/sql/40_observatory_utility_test.sql index 9e7c644..e0d49ce 100644 --- a/src/pg/test/sql/40_observatory_utility_test.sql +++ b/src/pg/test/sql/40_observatory_utility_test.sql @@ -10,7 +10,7 @@ SELECT set_config( -- OBS_GeomTable -- get table with known geometry_id -- should give back a table like obs_{hex hash} -SELECT +SELECT cdb_observatory.OBS_GeomTable( CDB_LatLng(40.7128,-74.0059), '"us.census.tiger".census_tract' @@ -18,7 +18,7 @@ SELECT -- get null for unknown geometry_id -- should give back null -SELECT +SELECT cdb_observatory.OBS_GeomTable( CDB_LatLng(40.7128,-74.0059), '"us.census.tiger".nonexistant_id' @@ -30,7 +30,7 @@ SELECT -- -----------|-----------------|----------- -- geoid | obs_{hex table} | null -- total_pop | obs_{hex table} | sum -SELECT +SELECT (unnest(cdb_observatory.OBS_GetColumnData( '"us.census.tiger".census_tract', Array['"us.census.tiger".census_tract_geoid', '"us.census.acs".B01001001'], @@ -40,16 +40,16 @@ ORDER BY 1 ASC; -- OBS_LookupCensusHuman -- should give back: {"\"us.census.acs\".B19083001"} -SELECT +SELECT cdb_observatory.OBS_LookupCensusHuman( Array['gini_index'] ); -- OBS_BuildSnapshotQuery -- Should give back: SELECT vals[1] As total_pop, vals[2] As male_pop, vals[3] As female_pop, vals[4] As median_age -SELECT +SELECT cdb_observatory.OBS_BuildSnapshotQuery( Array['total_pop','male_pop','female_pop','median_age'] ); -\i test/sql/drop_fixtures.sql \ No newline at end of file +\i test/sql/drop_fixtures.sql diff --git a/src/pg/test/sql/drop_fixtures.sql b/src/pg/test/sql/drop_fixtures.sql index 9d49a14..5201029 100644 --- a/src/pg/test/sql/drop_fixtures.sql +++ b/src/pg/test/sql/drop_fixtures.sql @@ -35,4 +35,12 @@ DROP TABLE observatory.obs_ab038198aaab3f3cb055758638ee4de28ad70146; DROP TABLE observatory.obs_a92e1111ad3177676471d66bb8036e6d057f271b; \echo Done. +\echo Dropping obs_11ee8b82c877c073438bc935a91d3dfccef875d1 fixture table... +DROP TABLE observatory.obs_11ee8b82c877c073438bc935a91d3dfccef875d1; +\echo Done. + +\echo Dropping obs_d34555209878e8c4b37cf0b2b3d072ff129ec470 fixture table... +DROP TABLE observatory.obs_d34555209878e8c4b37cf0b2b3d072ff129ec470; +\echo Done. + \unset ECHO diff --git a/src/pg/test/sql/load_fixtures.sql b/src/pg/test/sql/load_fixtures.sql index cd7306d..721558a 100644 --- a/src/pg/test/sql/load_fixtures.sql +++ b/src/pg/test/sql/load_fixtures.sql @@ -35,4 +35,12 @@ SET client_min_messages TO WARNING; \i test/fixtures/obs_a92e1111ad3177676471d66bb8036e6d057f271b.sql \echo Done. +\echo Loading obs_11ee8b82c877c073438bc935a91d3dfccef875d1.sql fixture file... +\i test/fixtures/obs_11ee8b82c877c073438bc935a91d3dfccef875d1.sql +\echo Done. + +\echo Loading obs_d34555209878e8c4b37cf0b2b3d072ff129ec470.sql fixture file... +\i test/fixtures/obs_d34555209878e8c4b37cf0b2b3d072ff129ec470.sql +\echo Done. + \unset ECHO