From fc6556170dafa19bd0ec0e5d8036f3f0002df9fa Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 14 Dec 2015 15:27:05 -0800 Subject: [PATCH] let's not depend on CREATE EXTENSION working in C++ code --- test/data | 2 +- test/unit/datasource/postgis.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/data b/test/data index d87aa96b3..5be80ebbd 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit d87aa96b301200d4cd74f0ee08d2bfc2aad3b686 +Subproject commit 5be80ebbd596e42e45fc6dfd4cfca0cc6b814c73 diff --git a/test/unit/datasource/postgis.cpp b/test/unit/datasource/postgis.cpp index 72dc3300b..f6d02794c 100644 --- a/test/unit/datasource/postgis.cpp +++ b/test/unit/datasource/postgis.cpp @@ -71,10 +71,10 @@ namespace postgistest { { //don't add 'true' here, to get error message, when drop fails. If it works nothing is output REQUIRE(run("dropdb --if-exists " + dbname)); - //From postgres 9.1 on template is not necessary anymore, just 'CREATE EXTENSION postgis;' - //REQUIRE(run("createdb -T template_postgis " + dbname)); - REQUIRE(run("createdb " + dbname)); - REQUIRE(run("psql -c 'CREATE EXTENSION postgis;' " + dbname, true)); + REQUIRE(run("createdb -T template_postgis " + dbname)); + //REQUIRE(run("createdb " + dbname)); + // Breaks when raster support is missing (unfortunately this is common) + //REQUIRE(run("psql -c 'CREATE EXTENSION postgis;' " + dbname, true)); REQUIRE(run("psql -q -f ./test/data/sql/postgis-create-db-and-tables.sql " + dbname)); }