archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

let's not depend on CREATE EXTENSION working in C++ code

Browse Source
This commit is contained in:
Dane Springmeyer 2015-12-14 15:27:05 -08:00
parent b42f072ad3
commit fc6556170d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/data

@ -1 +1 @@
Subproject commit d87aa96b301200d4cd74f0ee08d2bfc2aad3b686
Subproject commit 5be80ebbd596e42e45fc6dfd4cfca0cc6b814c73

8
test/unit/datasource/postgis.cpp
View File

@ -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));
}