Added test for loading out-db rasters in raster2pgsql

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

diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index a003bde63d5613b47bbe779ae7df0b2e2418b5e3..e6513b7a0f47dec7b91a8bb340df30fc70203093 100644 (file)
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -125,6 +125,7 @@ TEST_LOADER = \
        loader/Basic \
        loader/BasicCopy \
        loader/BasicFilename \
+       loader/BasicOutDB \
        loader/Tiled10x10 \
        loader/Tiled10x10Copy \
        loader/Tiled8x8

diff --git a/raster/test/regress/loader/BasicOutDB-post.pl b/raster/test/regress/loader/BasicOutDB-post.pl
new file mode 100755 (executable)
index 0000000..a1fd807
--- /dev/null
+++ b/raster/test/regress/loader/BasicOutDB-post.pl
@@ -0,0 +1,2 @@
+unlink "loader/BasicOutDB.tif";
+unlink "loader/BasicOutDB.opts";

diff --git a/raster/test/regress/loader/BasicOutDB-post.sh b/raster/test/regress/loader/BasicOutDB-post.sh
new file mode 100755 (executable)
index 0000000..bc08ce3
--- /dev/null
+++ b/raster/test/regress/loader/BasicOutDB-post.sh
@@ -0,0 +1,2 @@
+rm -f loader/BasicOutDB.tif
+rm -f loader/BasicOutDB.opts

diff --git a/raster/test/regress/loader/BasicOutDB-pre.pl b/raster/test/regress/loader/BasicOutDB-pre.pl
new file mode 100755 (executable)
index 0000000..03dd841
--- /dev/null
+++ b/raster/test/regress/loader/BasicOutDB-pre.pl
@@ -0,0 +1,12 @@
+use File::Basename;
+use Cwd 'abs_path';
+
+my $REGDIR = abs_path(dirname($0));
+my $RASTERDIR = abs_path($REGDIR . "/../raster/test/regress");
+my $FILERASTER = $RASTERDIR . "/loader/testraster.tif";
+
+link "loader/testraster.tif", "loader/BasicOutDB.tif";
+
+open(OPTS, '>', 'loader/BasicOutDB.opts');
+print OPTS "-F -C -R \"$FILERASTER\"\n";
+close(OPTS);

diff --git a/raster/test/regress/loader/BasicOutDB-pre.sh b/raster/test/regress/loader/BasicOutDB-pre.sh
new file mode 100755 (executable)
index 0000000..7f2aa58
--- /dev/null
+++ b/raster/test/regress/loader/BasicOutDB-pre.sh
@@ -0,0 +1,7 @@
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+cp loader/testraster.tif loader/BasicOutDB.tif
+
+echo "-F -C -R \"$DIR/loader/testraster.tif\"" > $DIR/BasicOutDB.opts

diff --git a/raster/test/regress/loader/BasicOutDB.select.expected b/raster/test/regress/loader/BasicOutDB.select.expected
new file mode 100644 (file)
index 0000000..949d2b5
--- /dev/null
+++ b/raster/test/regress/loader/BasicOutDB.select.expected
@@ -0,0 +1,4 @@
+0|1.0000000000|-1.0000000000|90|90|t|f|3|{8BUI,8BUI,8BUI}|{NULL,NULL,NULL}|{t,t,t}|POLYGON((0 0,90 0,90 -90,0 -90,0 0))
+POLYGON((0 0,1 0,1 -1,0 -1,0 0))|255
+POLYGON((89 -89,90 -89,90 -90,89 -90,89 -89))|0
+POLYGON((44 -44,45 -44,45 -45,44 -45,44 -44))|0

diff --git a/raster/test/regress/loader/BasicOutDB.select.sql b/raster/test/regress/loader/BasicOutDB.select.sql
new file mode 100644 (file)
index 0000000..9148b6c
--- /dev/null
+++ b/raster/test/regress/loader/BasicOutDB.select.sql
@@ -0,0 +1,5 @@
+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';
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 1)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 1 AND y = 1;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 2)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 90 AND y = 90;
+SELECT ST_AsEWKT(geom), val FROM (SELECT (ST_PixelAsPolygons(rast, 3)).* FROM loadedrast WHERE rid = 1) foo WHERE x = 45 AND y = 45;

diff --git a/raster/test/regress/rt_addband-post.sh b/raster/test/regress/rt_addband-post.sh
index fe22c8ac99acc2d5be2608557cdc0307476454cb..e17075809a1a715db70d0e4be735d6263b0451dd 100755 (executable)
--- a/raster/test/regress/rt_addband-post.sh
+++ b/raster/test/regress/rt_addband-post.sh
@@ -2,5 +2,5 @@ SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-rm -f $DIR/$TEST-pre.sql
-rm -f $DIR/$TEST-post.sql
+rm -f "$DIR/$TEST-pre.sql"
+rm -f "$DIR/$TEST-post.sql"

diff --git a/raster/test/regress/rt_addband-pre.sh b/raster/test/regress/rt_addband-pre.sh
index 39251110f34e10d7b5795bc25c571014ae6a3d72..68770fa6b3f23ee14fa9b1f3afff1848b4dd0364 100755 (executable)
--- a/raster/test/regress/rt_addband-pre.sh
+++ b/raster/test/regress/rt_addband-pre.sh
@@ -44,6 +44,6 @@ SELECT \
        ) AS rast \
 "
 
-echo "$SQL" > $DIR/$TEST-pre.sql
+echo "$SQL" > "$DIR/$TEST-pre.sql"
 
-echo "DROP TABLE IF EXISTS raster_outdb_template;" > $DIR/$TEST-post.sql
+echo "DROP TABLE IF EXISTS raster_outdb_template;" > "$DIR/$TEST-post.sql"