From deb951ba5b3066b39acd7b62480330543f8cc822 Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Mon, 19 Dec 2011 01:53:09 +0000 Subject: [PATCH] Refactored and cleaned up the regressions checks of values in raster_columns and raster_overviews views. git-svn-id: http://svn.osgeo.org/postgis/trunk@8457 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/test/regress/check_raster_columns.sql | 18 +++++++-------- .../regress/check_raster_columns_expected | 16 ++++++++------ .../test/regress/check_raster_overviews.sql | 18 +++++++-------- .../regress/check_raster_overviews_expected | 22 +++++++++---------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/raster/test/regress/check_raster_columns.sql b/raster/test/regress/check_raster_columns.sql index 7d44e989f..28fb7aedc 100644 --- a/raster/test/regress/check_raster_columns.sql +++ b/raster/test/regress/check_raster_columns.sql @@ -62,22 +62,22 @@ SELECT make_test_raster(3, 2, 2, 1, 1, 0, 0, 4); SELECT make_test_raster(4, 2, 2, 2, 2, 0, 0, 5); SELECT AddRasterConstraints(current_schema(), 'test_raster_columns', 'rast'::name); -SELECT * FROM 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 = 'test_raster_columns'; SELECT DropRasterConstraints(current_schema(),'test_raster_columns', 'rast'::name); -SELECT * FROM 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 = 'test_raster_columns'; -SELECT AddRasterConstraints('test_raster_columns', 'rast', 'srid', 'extent', 'blocksize'); -SELECT * FROM raster_columns; +SELECT AddRasterConstraints('test_raster_columns', 'rast'::name, 'srid'::text, 'extent', 'blocksize'); +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 = 'test_raster_columns'; -SELECT DropRasterConstraints('test_raster_columns', 'rast', 'scale'); -SELECT * FROM raster_columns; +SELECT DropRasterConstraints('test_raster_columns', 'rast'::name, 'scale'::text); +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 = 'test_raster_columns'; SELECT AddRasterConstraints('test_raster_columns', 'rast', FALSE, TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE); -SELECT * FROM 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 = 'test_raster_columns'; -SELECT DropRasterConstraints(current_schema(), 'test_raster_columns', 'rast', 'scale'); -SELECT * FROM raster_columns; +SELECT DropRasterConstraints(current_schema(), 'test_raster_columns', 'rast'::name, 'scale'::text); +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 = 'test_raster_columns'; DROP FUNCTION make_test_raster(integer, integer, integer, double precision, double precision, double precision, double precision, double precision, double precision); DROP TABLE IF EXISTS test_raster_columns; diff --git a/raster/test/regress/check_raster_columns_expected b/raster/test/regress/check_raster_columns_expected index cf4ac4930..19c0fbf8d 100644 --- a/raster/test/regress/check_raster_columns_expected +++ b/raster/test/regress/check_raster_columns_expected @@ -11,7 +11,7 @@ NOTICE: Adding pixel type constraint NOTICE: Adding nodata value constraint NOTICE: Adding maximum extent constraint t -postgis_reg|public|test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +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 @@ -26,13 +26,13 @@ NOTICE: Dropping pixel type constraint NOTICE: Dropping nodata value constraint NOTICE: Dropping maximum extent constraint t -postgis_reg|public|test_raster_columns|rast|0|||||f|f|||| +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 -postgis_reg|public|test_raster_columns|rast|0|||2|2|f|f||||0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +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 @@ -40,7 +40,7 @@ NOTICE: Dropping scale-Y constraint NOTICE: The constraint "enforce_scaley_rast" does not exist. Skipping PL/pgSQL function "droprasterconstraints" line 67 at assignment t -postgis_reg|public|test_raster_columns|rast|0|||2|2|f|f||||0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +test_raster_columns|rast|0|||2|2|f|f||||0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 NOTICE: Adding scale-X constraint NOTICE: Adding scale-Y constraint NOTICE: Adding alignment constraint @@ -51,6 +51,8 @@ NOTICE: The constraint "enforce_max_extent_rast" already exists. To replace th PL/pgSQL function "addrasterconstraints" line 96 at assignment PL/pgSQL function "addrasterconstraints" line 48 at RETURN t -postgis_reg|public|test_raster_columns|rast|0|1|1|2|2|t|f|1||{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 -ERROR: The table 'public' does not occur in the search_path -postgis_reg|public|test_raster_columns|rast|0|1|1|2|2|t|f|1||{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +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 85fd9e509..e2b98d1dc 100644 --- a/raster/test/regress/check_raster_overviews.sql +++ b/raster/test/regress/check_raster_overviews.sql @@ -65,24 +65,24 @@ SELECT make_test_raster(4, 2, 2, 2, 2, 0, 0, 5); SELECT * INTO test_raster_overviews FROM test_raster_columns; -SELECT * FROM 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 AddRasterConstraints(current_schema(), 'test_raster_columns', 'rast'::name); -SELECT * FROM raster_columns; -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'); +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 * FROM raster_columns; -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'); +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 * FROM raster_columns; -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'); +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 * FROM raster_columns; -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'); +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); DROP TABLE IF EXISTS test_raster_overviews; diff --git a/raster/test/regress/check_raster_overviews_expected b/raster/test/regress/check_raster_overviews_expected index b06c86757..deec51c35 100644 --- a/raster/test/regress/check_raster_overviews_expected +++ b/raster/test/regress/check_raster_overviews_expected @@ -1,8 +1,8 @@ raster_overviews NOTICE: table "test_raster_columns" does not exist, skipping NOTICE: table "test_raster_overviews" does not exist, skipping -postgis_reg|public|test_raster_columns|rast|0|||||f|f|||| -postgis_reg|public|test_raster_overviews|rast|0|||||f|f|||| +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 @@ -14,15 +14,15 @@ NOTICE: Adding pixel type constraint NOTICE: Adding nodata value constraint NOTICE: Adding maximum extent constraint t -postgis_reg|public|test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 -postgis_reg|public|test_raster_overviews|rast|0|||||f|f|||| +test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +test_raster_overviews|rast|0|||||f|f|||| t -postgis_reg|public|test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 -postgis_reg|public|test_raster_overviews|rast|0|||||f|f|||| -postgis_reg|public|test_raster_overviews|rast|postgis_reg|public|test_raster_columns|rast|1 +test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +test_raster_overviews|rast|0|||||f|f|||| +test_raster_overviews|rast|test_raster_columns|rast|1 t -postgis_reg|public|test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 -postgis_reg|public|test_raster_overviews|rast|0|||||f|f|||| +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 @@ -37,5 +37,5 @@ NOTICE: Dropping pixel type constraint NOTICE: Dropping nodata value constraint NOTICE: Dropping maximum extent constraint t -postgis_reg|public|test_raster_columns|rast|0|||||f|f|||| -postgis_reg|public|test_raster_overviews|rast|0|||||f|f|||| +test_raster_overviews|rast|0|||||f|f|||| +test_raster_columns|rast|0|||||f|f|||| -- 2.40.0