Unit tests fail on PostgreSQL 9.1 due to GUC behavior changes between 9.1 and 9.2...

git-svn-id: http://svn.osgeo.org/postgis/trunk@12486 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/raster/test/regress/load_outdb-pre.pl b/raster/test/regress/load_outdb-pre.pl
index a2faff90c8f20b1916a9f84a37c716e92c25559e..a10c0a81ab45c1683da78af22b09dbae14a357ec 100755 (executable)
--- a/raster/test/regress/load_outdb-pre.pl
+++ b/raster/test/regress/load_outdb-pre.pl
@@ -13,6 +13,10 @@ if (lc($^O) eq "msys") {
 }
 
 my $sql = <<"END";
+WITH foo AS (
+       SELECT postgis_raster_lib_version()
+)
+SELECT NULL FROM foo;
 SET postgis.gdal_enabled_drivers = 'GTiff';
 DROP TABLE IF EXISTS raster_outdb_template;
 CREATE TABLE raster_outdb_template AS

diff --git a/raster/test/regress/load_outdb-pre.sh b/raster/test/regress/load_outdb-pre.sh
index 41dbd05e10720845a400738df6313d6637216964..a8007f63ec3f3de39fc36c80ff69149f5808732c 100755 (executable)
--- a/raster/test/regress/load_outdb-pre.sh
+++ b/raster/test/regress/load_outdb-pre.sh
@@ -11,7 +11,11 @@ if [ "$CSYS" == "msys" ]; then
 fi
 
 SQL=" \
-SET postgis.gdal_enabled_drivers = 'GTiff';
+WITH foo AS ( \
+       SELECT postgis_raster_lib_version() \
+) \
+SELECT NULL FROM foo; \
+SET postgis.gdal_enabled_drivers = 'GTiff'; \
 DROP TABLE IF EXISTS raster_outdb_template; \
 CREATE TABLE raster_outdb_template AS \
 SELECT \

diff --git a/raster/test/regress/loader/BasicOutDB.select.sql b/raster/test/regress/loader/BasicOutDB.select.sql
index 7ac68f147272d9912e8fafba59777503bf9c55d1..c586d879337e76bef4029eb12d30f27b811c267e 100644 (file)
--- a/raster/test/regress/loader/BasicOutDB.select.sql
+++ b/raster/test/regress/loader/BasicOutDB.select.sql
@@ -1,3 +1,7 @@
+WITH foo AS (
+       SELECT postgis_raster_lib_version()
+)
+SELECT NULL FROM foo;
 SET postgis.gdal_enabled_drivers = 'GTiff';
 DELETE FROM loadedrast WHERE filename != 'testraster.tif';
 SELECT srid, scale_x::numeric(16, 10), scale_y::numeric(16, 10), blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values::numeric(16,10)[], out_db, ST_AsEWKT(extent) FROM raster_columns WHERE r_table_name = 'loadedrast' AND r_raster_column = 'rast';

diff --git a/raster/test/regress/permitted_gdal_drivers.sql b/raster/test/regress/permitted_gdal_drivers.sql
index 4e2ff5f760cc4cb66743877784c003a19c2fc00e..ec285be88d2f4348dfd7b0dc65d81463695cbf6c 100644 (file)
--- a/raster/test/regress/permitted_gdal_drivers.sql
+++ b/raster/test/regress/permitted_gdal_drivers.sql
@@ -1,3 +1,7 @@
+WITH foo AS (
+       SELECT postgis_raster_lib_version()
+)
+SELECT NULL FROM foo;
 SET postgis.gdal_enabled_drivers = 'GTiff PNG JPEG';
 INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (4326,'EPSG',4326,'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]','+proj=longlat +datum=WGS84 +no_defs ');
 INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (3857,'EPSG',3857,'PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs"],AUTHORITY["EPSG","3857"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs');

diff --git a/raster/test/regress/rt_asgdalraster.sql b/raster/test/regress/rt_asgdalraster.sql
index eca026cdf84114bc9860586a3cab6bae14d3578c..53982b9781c62f8a601cf2deca7b8e01e06bacf7 100644 (file)
--- a/raster/test/regress/rt_asgdalraster.sql
+++ b/raster/test/regress/rt_asgdalraster.sql
@@ -1,3 +1,7 @@
+WITH foo AS (
+       SELECT postgis_raster_lib_version()
+)
+SELECT NULL FROM foo;
 SET postgis.gdal_enabled_drivers = 'GTiff PNG JPEG';
 SELECT CASE
        WHEN length(

diff --git a/raster/test/regress/rt_asjpeg.sql b/raster/test/regress/rt_asjpeg.sql
index 6f7e0e70c739687c539e2f09182ac19e363f859c..f24fbb60258dd4f453e1f7005b3195d76ec862e3 100644 (file)
--- a/raster/test/regress/rt_asjpeg.sql
+++ b/raster/test/regress/rt_asjpeg.sql
@@ -1,3 +1,7 @@
+WITH foo AS (
+       SELECT postgis_raster_lib_version()
+)
+SELECT NULL FROM foo;
 SET postgis.gdal_enabled_drivers = 'JPEG';
 SELECT ST_AsJPEG(NULL) IS NULL;
 SELECT CASE

diff --git a/raster/test/regress/rt_aspng.sql b/raster/test/regress/rt_aspng.sql
index 501f0af2e6a78521662ac1ce16a77ed3baa18aa5..30b46c745f212e179e1d65344e6dafa895aaa932 100644 (file)
--- a/raster/test/regress/rt_aspng.sql
+++ b/raster/test/regress/rt_aspng.sql
@@ -1,3 +1,7 @@
+WITH foo AS (
+       SELECT postgis_raster_lib_version()
+)
+SELECT NULL FROM foo;
 SET postgis.gdal_enabled_drivers = 'PNG';
 SELECT ST_AsPNG(NULL) IS NULL;
 SELECT CASE

diff --git a/raster/test/regress/rt_astiff.sql b/raster/test/regress/rt_astiff.sql
index 1342a4acf489c17be1d2d8cdc97ad10340a61945..6ddbc1da868c2bdd4d4c0f1daef339d42635fcd6 100644 (file)
--- a/raster/test/regress/rt_astiff.sql
+++ b/raster/test/regress/rt_astiff.sql
@@ -1,3 +1,7 @@
+WITH foo AS (
+       SELECT postgis_raster_lib_version()
+)
+SELECT NULL FROM foo;
 SET postgis.gdal_enabled_drivers = 'GTiff';
 SELECT ST_AsTIFF(NULL) IS NULL;
 SELECT ST_AsTIFF(NULL, 'JPEG') IS NULL;

diff --git a/raster/test/regress/rt_fromgdalraster.sql b/raster/test/regress/rt_fromgdalraster.sql
index c80ff6151ccdc262973184b9b0c5303bd3085bce..1d4076537004849ae269c1723984d0ecb4e27b78 100644 (file)
--- a/raster/test/regress/rt_fromgdalraster.sql
+++ b/raster/test/regress/rt_fromgdalraster.sql
@@ -1,3 +1,7 @@
+WITH foo AS (
+       SELECT postgis_raster_lib_version()
+)
+SELECT NULL FROM foo;
 SET postgis.gdal_enabled_drivers = 'GTiff PNG';
 /*
 Driver: PNG/Portable Network Graphics