From e54d95fa8fdc65f94a4d05807b08f5e274b51ae0 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Fri, 22 Jul 2016 17:43:11 +0000 Subject: [PATCH 1/3] remove unused plpythonu and cartodb dependencies Fixes #161 --- src/pg/test/expected/01_install_test.out | 2 -- src/pg/test/sql/01_install_test.sql | 2 -- src/pg/test/sql/44_observatory_geometries_test.sql | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pg/test/expected/01_install_test.out b/src/pg/test/expected/01_install_test.out index 4851fd3..50dd883 100644 --- a/src/pg/test/expected/01_install_test.out +++ b/src/pg/test/expected/01_install_test.out @@ -1,6 +1,4 @@ -- Install dependencies CREATE EXTENSION postgis; -CREATE EXTENSION plpythonu; -CREATE EXTENSION cartodb; -- Install the extension CREATE EXTENSION observatory VERSION 'dev'; diff --git a/src/pg/test/sql/01_install_test.sql b/src/pg/test/sql/01_install_test.sql index f46a6e0..5092272 100644 --- a/src/pg/test/sql/01_install_test.sql +++ b/src/pg/test/sql/01_install_test.sql @@ -1,7 +1,5 @@ -- Install dependencies CREATE EXTENSION postgis; -CREATE EXTENSION plpythonu; -CREATE EXTENSION cartodb; -- Install the extension CREATE EXTENSION observatory VERSION 'dev'; diff --git a/src/pg/test/sql/44_observatory_geometries_test.sql b/src/pg/test/sql/44_observatory_geometries_test.sql index 149e9ae..6d8e9ca 100644 --- a/src/pg/test/sql/44_observatory_geometries_test.sql +++ b/src/pg/test/sql/44_observatory_geometries_test.sql @@ -34,7 +34,7 @@ SELECT cdb_observatory.OBS_GetBoundary( -- expect null geometry since there are no census tracts at null island -- timespan implictly null SELECT cdb_observatory.OBS_GetBoundary( - CDB_LatLng(0, 0), + ST_SetSRID(ST_MakePoint(0, 0), 4326), 'us.census.tiger.census_tract' ) IS NULL As OBS_GetBoundary_null_island_census_tract; @@ -78,7 +78,7 @@ SELECT cdb_observatory.OBS_GetBoundaryId( -- should give back null since there is not a census tract at null island SELECT cdb_observatory.OBS_GetBoundaryId( - CDB_LatLng(0, 0), + ST_SetSRID(ST_MakePoint(0, 0), 4326), 'us.census.tiger.census_tract' ) IS NULL As OBS_GetBoundaryId_null_island; From 8187ab4bbe255ea4e9ade74cba844b5c943fb1cf Mon Sep 17 00:00:00 2001 From: John Krauss Date: Fri, 22 Jul 2016 17:44:16 +0000 Subject: [PATCH 2/3] ensure tests run in order. Fixes #162 --- src/pg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pg/Makefile b/src/pg/Makefile index 6dc25f1..5343989 100644 --- a/src/pg/Makefile +++ b/src/pg/Makefile @@ -24,7 +24,7 @@ $(DATA): $(SOURCES_DATA) $(SED) $(REPLACEMENTS) $(SOURCES_DATA_DIR)/*.sql > $@ TEST_DIR = test -REGRESS = $(notdir $(basename $(wildcard $(TEST_DIR)/sql/*test.sql))) +REGRESS = $(sort $(notdir $(basename $(wildcard $(TEST_DIR)/sql/*test.sql)))) REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)' PG_CONFIG = pg_config From cf242515e376c693dca686f3e7c109ca06ffd3a1 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Fri, 22 Jul 2016 18:59:11 +0000 Subject: [PATCH 3/3] install postgres_fdw in test setup. fixes #166 --- src/pg/test/expected/01_install_test.out | 1 + src/pg/test/sql/01_install_test.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pg/test/expected/01_install_test.out b/src/pg/test/expected/01_install_test.out index 50dd883..9c82e7c 100644 --- a/src/pg/test/expected/01_install_test.out +++ b/src/pg/test/expected/01_install_test.out @@ -1,4 +1,5 @@ -- Install dependencies CREATE EXTENSION postgis; +CREATE EXTENSION postgres_fdw; -- Install the extension CREATE EXTENSION observatory VERSION 'dev'; diff --git a/src/pg/test/sql/01_install_test.sql b/src/pg/test/sql/01_install_test.sql index 5092272..781b0ae 100644 --- a/src/pg/test/sql/01_install_test.sql +++ b/src/pg/test/sql/01_install_test.sql @@ -1,5 +1,6 @@ -- Install dependencies CREATE EXTENSION postgis; +CREATE EXTENSION postgres_fdw; -- Install the extension CREATE EXTENSION observatory VERSION 'dev';