From c2f8b62af6d75db703fa36ffb8cf164648a2a4b5 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sun, 18 Dec 2011 22:42:33 +0000 Subject: [PATCH] Do not expect things to happen in "userland" schema (what is it?) git-svn-id: http://svn.osgeo.org/postgis/trunk@8455 b70326c6-7e19-0410-871a-916f4a2858ee --- .../regress/check_raster_columns_expected | 14 ++++++------ .../regress/check_raster_overviews_expected | 22 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/raster/test/regress/check_raster_columns_expected b/raster/test/regress/check_raster_columns_expected index 22af80244..cf4ac4930 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|userland|test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +postgis_reg|public|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|userland|test_raster_columns|rast|0|||||f|f|||| +postgis_reg|public|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|userland|test_raster_columns|rast|0|||2|2|f|f||||0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +postgis_reg|public|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|userland|test_raster_columns|rast|0|||2|2|f|f||||0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +postgis_reg|public|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,6 @@ 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|userland|test_raster_columns|rast|0|1|1|2|2|t|f|1||{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 -ERROR: The table 'userland' does not occur in the search_path -postgis_reg|userland|test_raster_columns|rast|0|1|1|2|2|t|f|1||{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 +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 diff --git a/raster/test/regress/check_raster_overviews_expected b/raster/test/regress/check_raster_overviews_expected index f25d7fddd..b06c86757 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|userland|test_raster_columns|rast|0|||||f|f|||| -postgis_reg|userland|test_raster_overviews|rast|0|||||f|f|||| +postgis_reg|public|test_raster_columns|rast|0|||||f|f|||| +postgis_reg|public|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|userland|test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 -postgis_reg|userland|test_raster_overviews|rast|0|||||f|f|||| +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|||| t -postgis_reg|userland|test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 -postgis_reg|userland|test_raster_overviews|rast|0|||||f|f|||| -postgis_reg|userland|test_raster_overviews|rast|postgis_reg|userland|test_raster_columns|rast|1 +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 t -postgis_reg|userland|test_raster_columns|rast|0|1|1|2|2|t|f|1|{8BUI}|{0}|0103000000010000000800000000000000000000C000000000000000C000000000000000C000000000000000000000000000000040000000000000104000000000000010400000000000001040000000000000104000000000000000400000000000000840000000000000F0BF000000000000000000000000000000C000000000000000C000000000000000C0 -postgis_reg|userland|test_raster_overviews|rast|0|||||f|f|||| +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|||| 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|userland|test_raster_columns|rast|0|||||f|f|||| -postgis_reg|userland|test_raster_overviews|rast|0|||||f|f|||| +postgis_reg|public|test_raster_columns|rast|0|||||f|f|||| +postgis_reg|public|test_raster_overviews|rast|0|||||f|f|||| -- 2.40.0