From: Bborie Park Date: Tue, 22 Apr 2014 14:29:30 +0000 (+0000) Subject: Unit tests fail on PostgreSQL 9.1 due to GUC behavior changes between 9.1 and 9.2... X-Git-Tag: 2.2.0rc1~1120 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bf085f19cee34b750daccdaf8f76b4a93c66067;p=postgis Unit tests fail on PostgreSQL 9.1 due to GUC behavior changes between 9.1 and 9.2. Ticket #2714 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 a2faff90c..a10c0a81a 100755 --- 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 41dbd05e1..a8007f63e 100755 --- 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 7ac68f147..c586d8793 100644 --- 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 4e2ff5f76..ec285be88 100644 --- 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 eca026cdf..53982b978 100644 --- 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 6f7e0e70c..f24fbb602 100644 --- 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 501f0af2e..30b46c745 100644 --- 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 1342a4acf..6ddbc1da8 100644 --- 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 c80ff6151..1d4076537 100644 --- 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