Fixed to suppress PL/pgSQL notices causing issues due to line # output. Added order...

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

diff --git a/raster/test/regress/check_raster_columns.sql b/raster/test/regress/check_raster_columns.sql
index 28fb7aedc6f7cbc4ebf349ff0505514a68c4f1ca..789219610a3fd1efb2ee64297a64aa1716c8dee7 100644 (file)
--- a/raster/test/regress/check_raster_columns.sql
+++ b/raster/test/regress/check_raster_columns.sql
@@ -9,6 +9,8 @@
 -- the terms of the GNU General Public Licence. See the COPYING file.
 -----------------------------------------------------------------------
 
+SET client_min_messages TO warning;
+
 -----------------------------------------------------------------------
 --- Test RASTER_COLUMNS
 -----------------------------------------------------------------------

diff --git a/raster/test/regress/check_raster_columns_expected b/raster/test/regress/check_raster_columns_expected
index 19c0fbf8d343d82638f4588153bdeb6eae6e0954..d28b23d022c689c5055cc94b3298520cdb69c172 100644 (file)
--- a/raster/test/regress/check_raster_columns_expected
+++ b/raster/test/regress/check_raster_columns_expected
@@ -1,58 +1,13 @@
 raster_columns
-NOTICE:  table "test_raster_columns" does not exist, skipping
-NOTICE:  Adding SRID constraint
-NOTICE:  Adding scale-X constraint
-NOTICE:  Adding scale-Y constraint
-NOTICE:  Adding blocksize-X constraint
-NOTICE:  Adding blocksize-Y constraint
-NOTICE:  Adding alignment constraint
-NOTICE:  Adding number of bands constraint
-NOTICE:  Adding pixel type constraint
-NOTICE:  Adding nodata value constraint
-NOTICE:  Adding maximum extent constraint
 t
 test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0
-NOTICE:  Dropping SRID constraint
-NOTICE:  Dropping scale-X constraint
-NOTICE:  Dropping scale-Y constraint
-NOTICE:  Dropping blocksize-X constraint
-NOTICE:  Dropping blocksize-Y constraint
-NOTICE:  Dropping alignment constraint
-NOTICE:  Dropping regular blocking constraint
-NOTICE:  The constraint "enforce_regular_blocking_rast" does not exist.  Skipping
-PL/pgSQL function "droprasterconstraints" line 48 at RETURN
-NOTICE:  Dropping number of bands constraint
-NOTICE:  Dropping pixel type constraint
-NOTICE:  Dropping nodata value constraint
-NOTICE:  Dropping maximum extent constraint
 t
 test_raster_columns|rast|0|||||f|f||||
-NOTICE:  Adding SRID constraint
-NOTICE:  Adding maximum extent constraint
-NOTICE:  Adding blocksize-X constraint
-NOTICE:  Adding blocksize-Y constraint
 t
 test_raster_columns|rast|0|||2|2|f|f||||0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0
-NOTICE:  Dropping scale-X constraint
-NOTICE:  The constraint "enforce_scalex_rast" does not exist.  Skipping
-PL/pgSQL function "droprasterconstraints" line 65 at assignment
-NOTICE:  Dropping scale-Y constraint
-NOTICE:  The constraint "enforce_scaley_rast" does not exist.  Skipping
-PL/pgSQL function "droprasterconstraints" line 67 at assignment
 t
 test_raster_columns|rast|0|||2|2|f|f||||0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0
-NOTICE:  Adding scale-X constraint
-NOTICE:  Adding scale-Y constraint
-NOTICE:  Adding alignment constraint
-NOTICE:  Adding number of bands constraint
-NOTICE:  Adding nodata value constraint
-NOTICE:  Adding maximum extent constraint
-NOTICE:  The constraint "enforce_max_extent_rast" already exists.  To replace the existing constraint, delete the constraint and call ApplyRasterConstraints again
-PL/pgSQL function "addrasterconstraints" line 96 at assignment
-PL/pgSQL function "addrasterconstraints" line 48 at RETURN
 t
 test_raster_columns|rast|0|1|1|2|2|t|f|1||{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0
-NOTICE:  Dropping scale-X constraint
-NOTICE:  Dropping scale-Y constraint
 t
 test_raster_columns|rast|0|||2|2|t|f|1||{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0

diff --git a/raster/test/regress/check_raster_overviews.sql b/raster/test/regress/check_raster_overviews.sql
index e2b98d1dc5d8017b4a5b1e106f95e996c2733599..8f3e86ffd2602cf543d208c1eb2820a2e4c19b2d 100644 (file)
--- a/raster/test/regress/check_raster_overviews.sql
+++ b/raster/test/regress/check_raster_overviews.sql
@@ -9,6 +9,8 @@
 -- the terms of the GNU General Public Licence. See the COPYING file.
 -----------------------------------------------------------------------
 
+SET client_min_messages TO warning;
+
 -----------------------------------------------------------------------
 --- Test RASTER_OVERVIEWS
 -----------------------------------------------------------------------
@@ -65,23 +67,23 @@ SELECT make_test_raster(4, 2, 2, 2, 2, 0, 0, 5);
 SELECT *
 INTO test_raster_overviews
 FROM test_raster_columns;
-SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews');
-SELECT * FROM raster_overviews;
+SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews') ORDER BY r_table_name, r_raster_column;
+SELECT o_table_name, o_raster_column, r_table_name, r_raster_column, overview_factor FROM raster_overviews WHERE o_table_name = 'test_raster_overviews';
 
 SELECT AddRasterConstraints(current_schema(), 'test_raster_columns', 'rast'::name);
-SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews');
+SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews') ORDER BY r_table_name, r_raster_column;
 SELECT o_table_name, o_raster_column, r_table_name, r_raster_column, overview_factor FROM raster_overviews WHERE o_table_name = 'test_raster_overviews';
 
 SELECT AddOverviewConstraints('test_raster_overviews', 'rast', 'test_raster_columns', 'rast', 1);
-SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews');
+SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews') ORDER BY r_table_name, r_raster_column;
 SELECT o_table_name, o_raster_column, r_table_name, r_raster_column, overview_factor FROM raster_overviews WHERE o_table_name = 'test_raster_overviews';
 
 SELECT DropOverviewConstraints(current_schema(), 'test_raster_overviews', 'rast');
-SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews');
+SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews') ORDER BY r_table_name, r_raster_column;
 SELECT o_table_name, o_raster_column, r_table_name, r_raster_column, overview_factor FROM raster_overviews WHERE o_table_name = 'test_raster_overviews';
 
 SELECT DropRasterConstraints(current_schema(), 'test_raster_columns', 'rast'::name);
-SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews');
+SELECT r_table_name, r_raster_column, srid, scale_x, scale_y, blocksize_x, blocksize_y, same_alignment, regular_blocking, num_bands, pixel_types, nodata_values, extent FROM raster_columns WHERE r_table_name IN ('test_raster_columns', 'test_raster_overviews') ORDER BY r_table_name, r_raster_column;
 SELECT o_table_name, o_raster_column, r_table_name, r_raster_column, overview_factor FROM raster_overviews WHERE o_table_name = 'test_raster_overviews';
 
 DROP FUNCTION make_test_raster(integer, integer, integer, double precision, double precision, double precision, double precision, double precision, double precision);

diff --git a/raster/test/regress/check_raster_overviews_expected b/raster/test/regress/check_raster_overviews_expected
index deec51c352ad86c700c19b4f55516e52daa95992..1198826869e9f6b0f69a0dbd4d708537b3ba08a2 100644 (file)
--- a/raster/test/regress/check_raster_overviews_expected
+++ b/raster/test/regress/check_raster_overviews_expected
@@ -1,18 +1,6 @@
 raster_overviews
-NOTICE:  table "test_raster_columns" does not exist, skipping
-NOTICE:  table "test_raster_overviews" does not exist, skipping
 test_raster_columns|rast|0|||||f|f||||
 test_raster_overviews|rast|0|||||f|f||||
-NOTICE:  Adding SRID constraint
-NOTICE:  Adding scale-X constraint
-NOTICE:  Adding scale-Y constraint
-NOTICE:  Adding blocksize-X constraint
-NOTICE:  Adding blocksize-Y constraint
-NOTICE:  Adding alignment constraint
-NOTICE:  Adding number of bands constraint
-NOTICE:  Adding pixel type constraint
-NOTICE:  Adding nodata value constraint
-NOTICE:  Adding maximum extent constraint
 t
 test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0
 test_raster_overviews|rast|0|||||f|f||||
@@ -23,19 +11,6 @@ test_raster_overviews|rast|test_raster_columns|rast|1
 t
 test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0
 test_raster_overviews|rast|0|||||f|f||||
-NOTICE:  Dropping SRID constraint
-NOTICE:  Dropping scale-X constraint
-NOTICE:  Dropping scale-Y constraint
-NOTICE:  Dropping blocksize-X constraint
-NOTICE:  Dropping blocksize-Y constraint
-NOTICE:  Dropping alignment constraint
-NOTICE:  Dropping regular blocking constraint
-NOTICE:  The constraint "enforce_regular_blocking_rast" does not exist.  Skipping
-PL/pgSQL function "droprasterconstraints" line 48 at RETURN
-NOTICE:  Dropping number of bands constraint
-NOTICE:  Dropping pixel type constraint
-NOTICE:  Dropping nodata value constraint
-NOTICE:  Dropping maximum extent constraint
 t
-test_raster_overviews|rast|0|||||f|f||||
 test_raster_columns|rast|0|||||f|f||||
+test_raster_overviews|rast|0|||||f|f||||

diff --git a/raster/test/regress/rt_intersection.sql b/raster/test/regress/rt_intersection.sql
index 9614a6aea8e643b2ad37a6c37a0ba226ce3a8423..3ebb1e62666f2d5f12f9629d288158e200eb8c65 100644 (file)
--- a/raster/test/regress/rt_intersection.sql
+++ b/raster/test/regress/rt_intersection.sql
@@ -1,3 +1,5 @@
+SET client_min_messages TO warning;
+
 DROP TABLE IF EXISTS raster_intersection;
 CREATE TABLE raster_intersection (
        rid integer,

diff --git a/raster/test/regress/rt_intersection_expected b/raster/test/regress/rt_intersection_expected
index 15353853f9ff3832f2004e68aa23b30d0750b452..38dc36e8bf70acedd167f64e119b7767bdd0ea48 100644 (file)
--- a/raster/test/regress/rt_intersection_expected
+++ b/raster/test/regress/rt_intersection_expected
@@ -1,101 +1,3 @@
-NOTICE:  table "raster_intersection" does not exist, skipping
-NOTICE:  table "raster_intersection_out" does not exist, skipping
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  rt_raster_copy_band: Second raster has no band
-NOTICE:  RASTER_copyband: Could not add band to raster. Returning original raster.
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  rt_raster_copy_band: Second raster has no band
-NOTICE:  RASTER_copyband: Could not add band to raster. Returning original raster.
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-PL/pgSQL function "st_intersection" line 7 at assignment
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-PL/pgSQL function "st_intersection" line 7 at assignment
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-PL/pgSQL function "st_intersection" line 7 at assignment
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-PL/pgSQL function "st_intersection" line 9 at assignment
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-PL/pgSQL function "st_intersection" line 9 at assignment
-NOTICE:  The two rasters provided have no intersection.  Returning no band raster
-PL/pgSQL function "st_intersection" line 9 at assignment
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Raster provided has no bands
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
 0|1|0.000|0.000|2|2|1.000|1.000|0.000|0.000|0|2|8BUI|t|0.000|1.000|1.000
 0|2|1.000|-1.000|1|2|1.000|1.000|0.000|0.000|0|2|8BUI|t|0.000|1.000|1.000
 0|3|1.000|1.000|1|1|1.000|1.000|0.000|0.000|0|2|8BUI|t|0.000|1.000|1.000