Use quiet psql on regress

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

diff --git a/raster/test/regress/bug_test_car5_expected b/raster/test/regress/bug_test_car5_expected
index 5599f5954ab72e86f01ed83321b319051a33437b..b5f25221128ee01a57769ea00554dac031e10a52 100644 (file)
--- a/raster/test/regress/bug_test_car5_expected
+++ b/raster/test/regress/bug_test_car5_expected
@@ -1,8 +1,6 @@
-BEGIN
 NOTICE:  SRID value -1 converted to the officially unknown SRID value 0 at character 41
 NOTICE:  SRID value -1 converted to the officially unknown SRID value 0 at character 41
 NOTICE:  SRID value -1 converted to the officially unknown SRID value 0 at character 41
 1|5|5|8BUI|8BUI|8BUI
 2|5|5|8BUI|8BUI|8BUI
 3|5|5|8BUI|8BUI|8BUI
-COMMIT

diff --git a/raster/test/regress/rt_count_expected b/raster/test/regress/rt_count_expected
index 11c5664a16d8361d30e755e48026f04a78daa26c..517c87ba5464b458c7542cd6a645e2dc05a6541d 100644 (file)
--- a/raster/test/regress/rt_count_expected
+++ b/raster/test/regress/rt_count_expected
@@ -2,7 +2,6 @@
 2
 100
 2
-BEGIN
 20
 1000
 20
@@ -16,7 +15,6 @@ BEGIN
 1000
 20
 1000
-SAVEPOINT
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
@@ -27,10 +25,4 @@ NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-COMMIT
-RELEASE
-SAVEPOINT
 ERROR:  Sample percent must be between zero and one
-COMMIT
-RELEASE
-COMMIT

diff --git a/raster/test/regress/rt_grayscale_expected b/raster/test/regress/rt_grayscale_expected
index 5b01d3280b3bf15b89c00a3583eeb2a556c5bfab..22e121d27222745225390c64f4f7836ce7ae9781 100644 (file)
--- a/raster/test/regress/rt_grayscale_expected
+++ b/raster/test/regress/rt_grayscale_expected
@@ -20,12 +20,6 @@ WARNING:  Only the first three elements of 'rastbandargset' will be used
 3|3|1|{{NULL,0},{254,254}}
 3|4|1|{{NULL,0},{254,254}}
 3|5|1|{{NULL,NULL},{128,128},{255,255}}
-BEGIN
 ERROR:  'rastbandargset' must have three bands for red, green and blue
-COMMIT
-BEGIN
 ERROR:  Band at index '2' not found for raster '2'
-COMMIT
-BEGIN
 ERROR:  Band at index '2' not found for raster '2'
-COMMIT

diff --git a/raster/test/regress/rt_histogram_expected b/raster/test/regress/rt_histogram_expected
index b6fa57b6fc49a08148542c646612d73241ec9861..e2d2882f826eb8032624e8dd182a321d39f1c2df 100644 (file)
--- a/raster/test/regress/rt_histogram_expected
+++ b/raster/test/regress/rt_histogram_expected
@@ -44,7 +44,6 @@
 -2.115|0.513|0|0.000
 0.513|3.142|1|0.500
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-BEGIN
 -10.000|-3.429|10|0.500
 -3.429|3.142|10|0.500
 -10.000|-3.429|10|0.500
@@ -75,7 +74,6 @@ BEGIN
 -10.000|-5.619|10|0.500
 -5.619|-1.239|0|0.000
 -1.239|3.142|10|0.500
-SAVEPOINT
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
@@ -87,16 +85,7 @@ NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 ERROR:  RASTER_histogramCoverage: Cannot get summary stats of coverage
-COMMIT
-RELEASE
-SAVEPOINT
 -10.000|-3.429|10|0.500
 -3.429|3.142|10|0.500
-COMMIT
-RELEASE
-SAVEPOINT
 -10.000|-3.429|10|0.500
 -3.429|3.142|10|0.500
-COMMIT
-RELEASE
-COMMIT

diff --git a/raster/test/regress/rt_quantile_expected b/raster/test/regress/rt_quantile_expected
index 5576fe50ab7c3bf314c6c2dca3adda984303cbcd..ff1716872c10eeed8389e3c4c9048e55cd05ec75 100644 (file)
--- a/raster/test/regress/rt_quantile_expected
+++ b/raster/test/regress/rt_quantile_expected
@@ -53,7 +53,6 @@
 0.000
 -4.086
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-BEGIN
 0.000|-10.000
 0.100|-10.000
 0.200|-10.000
@@ -94,22 +93,9 @@ BEGIN
 3.142
 3.142
 3.142
-SAVEPOINT
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-COMMIT
-RELEASE
-SAVEPOINT
 3.142
-COMMIT
-RELEASE
-SAVEPOINT
 3.142
-COMMIT
-RELEASE
-SAVEPOINT
 NOTICE:  Invalid value for quantile (must be between 0 and 1). Returning NULL
-COMMIT
-RELEASE
-COMMIT

diff --git a/raster/test/regress/rt_summarystats_expected b/raster/test/regress/rt_summarystats_expected
index 6a7ccb67b7bf16b0ef8b006038adab45a58605f4..8bed7afff2b79aa84485d6ea69f58f64f52a8b93 100644 (file)
--- a/raster/test/regress/rt_summarystats_expected
+++ b/raster/test/regress/rt_summarystats_expected
@@ -10,12 +10,10 @@ NOTICE:  All pixels of band have the NODATA value
 (0,,,,,)
 NOTICE:  Band is empty as width and/or height is 0
 (0,,,,,)
-BEGIN
 20|-68.584|-3.429|6.571|-10.000|3.142
 1000|-68.584|-0.069|1.046|-10.000|3.142
 20|-68.584|-3.429|6.571|-10.000|3.142
 20|-68.584|-3.429|6.571|-10.000|3.142
-SAVEPOINT
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
@@ -27,45 +25,15 @@ NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 0|||||
-COMMIT
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-COMMIT
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-COMMIT
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-COMMIT
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-COMMIT
-RELEASE
-SAVEPOINT
 20|-68.584|-3.429|6.571|-10.000|3.142
-COMMIT
-RELEASE
-SAVEPOINT
 1000|-68.584|-0.069|1.046|-10.000|3.142
-COMMIT
-RELEASE
-SAVEPOINT
 1000|-68.584|-0.069|1.046|-10.000|3.142
-COMMIT
-RELEASE
-SAVEPOINT
 1000|-68.584|-0.069|1.046|-10.000|3.142
-COMMIT
-RELEASE
-SAVEPOINT
 ERROR:  Invalid sample percentage (must be between 0 and 1). Returning NULL
-COMMIT
-RELEASE
-SAVEPOINT
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
@@ -77,6 +45,3 @@ NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 NOTICE:  Raster does not have band at index 2. Skipping raster
 0|||||
-COMMIT
-RELEASE
-COMMIT

diff --git a/raster/test/regress/rt_valuecount_expected b/raster/test/regress/rt_valuecount_expected
index 5b84f9babaef47c693d18246c39dea99e3123f43..c5132868e345dc1c3dd609e6a77f05386c4d0839 100644 (file)
--- a/raster/test/regress/rt_valuecount_expected
+++ b/raster/test/regress/rt_valuecount_expected
@@ -22,7 +22,6 @@
 1
 1
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-BEGIN
 -10.000|10
 0.000|980
 3.142|10
@@ -36,16 +35,6 @@ BEGIN
 0
 10
 0
-SAVEPOINT
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-COMMIT
-RELEASE
-SAVEPOINT
 ERROR:  relation "test1" does not exist at character 20
-COMMIT
-RELEASE
-SAVEPOINT
 ERROR:  column "rast1" does not exist at character 8
-COMMIT
-RELEASE
-COMMIT

diff --git a/raster/test/regress/rt_valuepercent_expected b/raster/test/regress/rt_valuepercent_expected
index 1a8495f6a6d3da5bfbbb641913fcd8af29fd8cc0..c430632f15aa359c1e6e725df33bd4a52e790639 100644 (file)
--- a/raster/test/regress/rt_valuepercent_expected
+++ b/raster/test/regress/rt_valuepercent_expected
@@ -18,7 +18,6 @@
 0.500
 0.500
 0.500
-BEGIN
 -10.000|0.010
 0.000|0.980
 3.142|0.010
@@ -32,4 +31,3 @@ BEGIN
 0.000
 0.500
 0.000
-COMMIT

diff --git a/regress/core/legacy_expected b/regress/core/legacy_expected
index 33218d06a2526357c662f2972d10ad2ca0af77df..b8bdb364c902fce6d5b0854910c84b6f5d49cba5 100644 (file)
--- a/regress/core/legacy_expected
+++ b/regress/core/legacy_expected
@@ -17,5 +17,3 @@ MapServer4|-9460|010700000001000|-9460
 Removing the data table...
 Done.
 1869|POINT(1 2)
-BEGIN
-COMMIT

diff --git a/regress/core/long_xact_expected b/regress/core/long_xact_expected
index fa6952cc9cf7d5037735dae186dca73e685c8d81..5acec95a58d23e56bc54434d8b7a738695544965 100644 (file)
--- a/regress/core/long_xact_expected
+++ b/regress/core/long_xact_expected
@@ -3,17 +3,11 @@ Long transactions support enabled
 1
 1
 ERROR:  UPDATE where "id" = '1' requires authorization 'auth1'
-BEGIN
 t
-COMMIT
 ERROR:  UPDATE where "id" = '1' requires authorization 'auth1'
-BEGIN
 t
-COMMIT
-BEGIN
 t
 ERROR:  UPDATE where "id" = '1' requires authorization 'auth1'
-COMMIT
 ERROR:  UPDATE where "id" = '2' requires authorization 'auth2'
 ERROR:  UPDATE where "id" = '1' requires authorization 'auth1'
 3|nolocks

diff --git a/regress/run_test.pl b/regress/run_test.pl
index a6ab0d00bf397bc3a712300f4b828bbd73b2a25e..30dbe1d2e36b0eeacf2a81c86042980b478149f5 100755 (executable)
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -597,7 +597,7 @@ sub run_simple_sql
 
        # Dump output to a temp file.
        my $tmpfile = sprintf("%s/test_%s_tmp", $TMPDIR, $RUN);
-       my $cmd = "psql -v \"VERBOSITY=terse\" -tXA $DB < $sql > $tmpfile 2>&1";
+       my $cmd = "psql -v \"VERBOSITY=terse\" -tXAq $DB < $sql > $tmpfile 2>&1";
        #print($cmd);
        my $rv = system($cmd);
        # Check if psql errored out.
@@ -626,7 +626,7 @@ sub run_simple_sql
 sub drop_table
 {
        my $tblname = shift;
-       my $cmd = "psql -tXA -d $DB -c \"DROP TABLE IF EXISTS $tblname\" >> $REGRESS_LOG 2>&1";
+       my $cmd = "psql -tXAq -d $DB -c \"DROP TABLE IF EXISTS $tblname\" >> $REGRESS_LOG 2>&1";
        my $rv = system($cmd);
        die "Could not run: $cmd\n" if $rv;
 }
@@ -704,7 +704,7 @@ sub run_simple_test
           . " -v \"tmpfile='$tmpfile'\""
           . " -v \"scriptdir=$scriptdir\""
           . " -v \"regdir=$REGDIR\""
-          . " -tXA $DB < $sql > $outfile 2>&1";
+          . " -tXAq $DB < $sql > $outfile 2>&1";
        my $rv = system($cmd);
 
        # Check for ERROR lines

diff --git a/regress/sfcgal/legacy_expected b/regress/sfcgal/legacy_expected
index 33218d06a2526357c662f2972d10ad2ca0af77df..b8bdb364c902fce6d5b0854910c84b6f5d49cba5 100644 (file)
--- a/regress/sfcgal/legacy_expected
+++ b/regress/sfcgal/legacy_expected
@@ -17,5 +17,3 @@ MapServer4|-9460|010700000001000|-9460
 Removing the data table...
 Done.
 1869|POINT(1 2)
-BEGIN
-COMMIT

diff --git a/topology/test/regress/copytopology_expected b/topology/test/regress/copytopology_expected
index ffdb1316b8c350bd55f80e380de264556571895d..d838f65076f7f9f738d9b6ea4a3f78a9cd3bf031 100644 (file)
--- a/topology/test/regress/copytopology_expected
+++ b/topology/test/regress/copytopology_expected
@@ -1,14 +1,10 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 t
 4326|0
 nodes|22

diff --git a/topology/test/regress/getringedges_expected b/topology/test/regress/getringedges_expected
index 25a36fee55a23edb24a1679080c524ddb5ca6130..904609da44a184f5b1255eec345caa950b60912f 100644 (file)
--- a/topology/test/regress/getringedges_expected
+++ b/topology/test/regress/getringedges_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 R1|1|1
 R2|1|2
 R2|2|3

diff --git a/topology/test/regress/gettopogeomelements_expected b/topology/test/regress/gettopogeomelements_expected
index c5e8822a6d85eb43dc12b09306a28a7422ab1be9..de8cd9a7417c2c7dd96e808b209a5d4a11ebfabd 100644 (file)
--- a/topology/test/regress/gettopogeomelements_expected
+++ b/topology/test/regress/gettopogeomelements_expected
@@ -1,14 +1,10 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 1|1|{3,3}
 1|1|{6,3}
 1|2|{4,3}

diff --git a/topology/test/regress/gml_expected b/topology/test/regress/gml_expected
index dc1d5f66311bf99cab3e688343dabd1f418ee5c9..3284e5477ab7b6830a0354fe0589d5d099d9f882 100644 (file)
--- a/topology/test/regress/gml_expected
+++ b/topology/test/regress/gml_expected
@@ -1,14 +1,10 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 S1-vanilla|<gml:TopoPoint><gml:directedNode><gml:Node gml:id="N14"><gml:pointProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326"><gml:pos srsDimension="2">21 14</gml:pos></gml:Point></gml:pointProperty></gml:Node></gml:directedNode></gml:TopoPoint>
 S2-vanilla|<gml:TopoPoint><gml:directedNode><gml:Node gml:id="N13"><gml:pointProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326"><gml:pos srsDimension="2">35 14</gml:pos></gml:Point></gml:pointProperty></gml:Node></gml:directedNode></gml:TopoPoint>
 S3-vanilla|<gml:TopoPoint><gml:directedNode><gml:Node gml:id="N6"><gml:pointProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326"><gml:pos srsDimension="2">57 33</gml:pos></gml:Point></gml:pointProperty></gml:Node></gml:directedNode></gml:TopoPoint>

diff --git a/topology/test/regress/layertrigger_expected b/topology/test/regress/layertrigger_expected
index 9d6e8571b876ad1562f658681d127dd003601d7f..3e7d754e8a704a2afb0113361669902efca05d71 100644 (file)
--- a/topology/test/regress/layertrigger_expected
+++ b/topology/test/regress/layertrigger_expected
@@ -5,12 +5,8 @@ t2.l1|1
 t2.rel|1|1|1|1
 ERROR:  The topology.layer table cannot be updated
 after update: topology.layer |2|1|t2|l1|g|1|0|
-BEGIN
 after delete n.1: topology.layer count|1
-COMMIT
-BEGIN
 after delete n.2: topology.layer count|1
-COMMIT
 after delete n.3: topology.layer count|0
 Topology 't2' dropped
 Topology 't1' dropped

diff --git a/topology/test/regress/legacy_invalid_expected b/topology/test/regress/legacy_invalid_expected
index b4d57549d6080faa6295a544f305f97df3e770ca..5fc633ad849754a0363c867023670b529a2335a8 100644 (file)
--- a/topology/test/regress/legacy_invalid_expected
+++ b/topology/test/regress/legacy_invalid_expected
@@ -1,4 +1,3 @@
-BEGIN
 t
 coincident nodes|1|23
 edge crosses node|1|23
@@ -19,5 +18,4 @@ face without edges|10|
 face has no rings|10|
 face within face|11|2
 face overlaps face|2|12
-COMMIT
 Topology 'invalid_topology' dropped

diff --git a/topology/test/regress/legacy_predicate_expected b/topology/test/regress/legacy_predicate_expected
index 74a99b659b0f85813337e329dbcb444c9d4c4bb4..b16bb2204273171cf350e199f620f7b0ed33ba5f 100644 (file)
--- a/topology/test/regress/legacy_predicate_expected
+++ b/topology/test/regress/legacy_predicate_expected
@@ -1,20 +1,15 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 4
 features.big_parcels.the_geom SRID:0 TYPE:MULTIPOLYGON DIMS:2 
 5
 6
 features.big_signs.the_geom SRID:0 TYPE:MULTIPOINT DIMS:2 
-BEGIN
 POINT/POINT INTERSECTS
 S1|N1N6N14
 S3|N1N6N14
@@ -116,5 +111,4 @@ P5|F1
 POINT/POINT EQUALS (simple/hierarchical)
 POLYGON/POLYGON EQUALS (simple/hierarchical)
 P1|F3F6
-COMMIT
 Topology 'city_data' dropped

diff --git a/topology/test/regress/legacy_query_expected b/topology/test/regress/legacy_query_expected
index 1f045a1ae601021522e460d3328e6668075abdbb..2faf4d5b15ade47ff68424ad6be0311c889f2b21 100644 (file)
--- a/topology/test/regress/legacy_query_expected
+++ b/topology/test/regress/legacy_query_expected
@@ -1,20 +1,15 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 4
 features.big_parcels.the_geom SRID:0 TYPE:MULTIPOLYGON DIMS:2 
 5
 6
 features.big_signs.the_geom SRID:0 TYPE:MULTIPOINT DIMS:2 
-BEGIN
 P1|1|MULTIPOLYGON(((21 14,21 6,9 6,9 14,9 22,21 22,21 14)))
 P2|2|MULTIPOLYGON(((35 14,35 6,21 6,21 14,21 22,35 22,35 14)))
 P3|3|MULTIPOLYGON(((47 14,47 6,35 6,35 14,35 22,47 22,47 14)))
@@ -46,5 +41,4 @@ R4|MULTILINESTRING((25 30,25 35))
 P1P2|MULTIPOLYGON(((21 6,9 6,9 14,9 22,21 22,35 22,35 14,35 6,21 6)))
 P3P4|MULTIPOLYGON(((47 14,47 6,35 6,35 14,35 22,47 22,47 14)),((25 30,17 30,17 40,31 40,31 30,25 30)))
 F3F6|MULTIPOLYGON(((21 14,21 6,9 6,9 14,9 22,21 22,21 14)))
-COMMIT
 Topology 'city_data' dropped

diff --git a/topology/test/regress/legacy_validate_expected b/topology/test/regress/legacy_validate_expected
index 7d163181843fb2a50cfb4cdaaa8a0f20cfbde4d5..3b01b1d2570cc98b2d7326121901425bf4afc89d 100644 (file)
--- a/topology/test/regress/legacy_validate_expected
+++ b/topology/test/regress/legacy_validate_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 Topology validation errors follow:
 End of topology validation errors
 Topology 'city_data' dropped

diff --git a/topology/test/regress/st_addedgemodface_expected b/topology/test/regress/st_addedgemodface_expected
index cb03d4224c10a1925d937a990cdcbdc768c84ec1..cfc96e00b73ddd363188204228c03e98d177b14a 100644 (file)
--- a/topology/test/regress/st_addedgemodface_expected
+++ b/topology/test/regress/st_addedgemodface_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 ERROR:  SQL/MM Spatial exception - start node not geometry start point.
 ERROR:  SQL/MM Spatial exception - end node not geometry end point.
 ERROR:  SQL/MM Spatial exception - end node not geometry end point.

diff --git a/topology/test/regress/st_addedgenewfaces_expected b/topology/test/regress/st_addedgenewfaces_expected
index f98b2290d3357d5c9874c37a7dad7532d75b8bcc..186d92dbda385688bfebd64d9c86e6587b80557e 100644 (file)
--- a/topology/test/regress/st_addedgenewfaces_expected
+++ b/topology/test/regress/st_addedgenewfaces_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 ERROR:  SQL/MM Spatial exception - start node not geometry start point.
 ERROR:  SQL/MM Spatial exception - end node not geometry end point.
 ERROR:  SQL/MM Spatial exception - end node not geometry end point.

diff --git a/topology/test/regress/st_addisonode_expected b/topology/test/regress/st_addisonode_expected
index 0099867e82da91252883967dcf56cd3b251c1fde..ca9e9716b0d687162b6f90bd782007c95bb118b8 100644 (file)
--- a/topology/test/regress/st_addisonode_expected
+++ b/topology/test/regress/st_addisonode_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument

diff --git a/topology/test/regress/st_changeedgegeom_expected b/topology/test/regress/st_changeedgegeom_expected
index 102a3223d5aa094b9807407a4708c6ad14f0bd4c..155f1b81ddcc86fad85ae2565f1a00443f469f79 100644 (file)
--- a/topology/test/regress/st_changeedgegeom_expected
+++ b/topology/test/regress/st_changeedgegeom_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 T1|Edge 25 changed
 ERROR:  SQL/MM Spatial exception - start node not geometry start point.
 ERROR:  SQL/MM Spatial exception - end node not geometry end point.

diff --git a/topology/test/regress/st_modedgeheal_expected b/topology/test/regress/st_modedgeheal_expected
index 511331a371f0ce69fc0959c2766869288290512f..e55d77744242ea8ae19a1d8d2d048fa5c16698a9 100644 (file)
--- a/topology/test/regress/st_modedgeheal_expected
+++ b/topology/test/regress/st_modedgeheal_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument

diff --git a/topology/test/regress/st_modedgesplit_expected b/topology/test/regress/st_modedgesplit_expected
index 62500b92aa5d1e72b3acf2fe077d688838a9e2ab..c7f7c92b2bd91e2496c0fee60e7ede62d1e4507c 100644 (file)
--- a/topology/test/regress/st_modedgesplit_expected
+++ b/topology/test/regress/st_modedgesplit_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 max|node|22
 max|edge|26
 ERROR:  geometry has too many points at character 53

diff --git a/topology/test/regress/st_newedgeheal_expected b/topology/test/regress/st_newedgeheal_expected
index 7d99c5c51a211dba534eb90b3ce092ee29fca25f..5b073237ce879d3bb9cf19d7c2c4c9a932472302 100644 (file)
--- a/topology/test/regress/st_newedgeheal_expected
+++ b/topology/test/regress/st_newedgeheal_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument

diff --git a/topology/test/regress/st_newedgessplit_expected b/topology/test/regress/st_newedgessplit_expected
index eefe3caebf3a8aa7872ec241ee62f01e73487e79..be76042dd740a08ddb4b3c019401d94cc04a04f8 100644 (file)
--- a/topology/test/regress/st_newedgessplit_expected
+++ b/topology/test/regress/st_newedgessplit_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 max|node|22
 max|edge|26
 ERROR:  geometry has too many points at character 54

diff --git a/topology/test/regress/st_remedgemodface_expected b/topology/test/regress/st_remedgemodface_expected
index c2531cfa0717dd7036003411a5b56a363772deaf..bfe3fce5c55492932a8779e26996853f7c03c2f8 100644 (file)
--- a/topology/test/regress/st_remedgemodface_expected
+++ b/topology/test/regress/st_remedgemodface_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - invalid topology name
@@ -182,17 +180,13 @@ RM(35)/edges|-|3|-30|-35|0|0
 RM(35)/edges|-|35|35|3|17|0
 RM(35)/faces|-|17|SRID=4326;POLYGON((22 27,22 30,28 30,28 27,22 27))
 Topology 'city_data' dropped
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 features.land_parcels.the_geom SRID:0 TYPE:MULTIPOLYGON DIMS:2 
 features.city_streets.the_geom SRID:0 TYPE:MULTILINESTRING DIMS:2 
 features.traffic_signs.the_geom SRID:0 TYPE:MULTIPOINT DIMS:2 

diff --git a/topology/test/regress/st_remedgenewface_expected b/topology/test/regress/st_remedgenewface_expected
index 911c46bae4cc9b5157eab37bd96d1cd7b4262bdb..c7c165b1fd35bbb28c379f994aab3b78afa654e6 100644 (file)
--- a/topology/test/regress/st_remedgenewface_expected
+++ b/topology/test/regress/st_remedgenewface_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - invalid topology name
@@ -212,17 +210,13 @@ RN(35)/edges|-|3|-30|-35|0|0
 RN(35)/edges|-|35|35|3|21|0
 RN(35)/faces|-|21|SRID=4326;POLYGON((22 27,22 30,28 30,28 27,22 27))
 Topology 'city_data' dropped
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 features.land_parcels.the_geom SRID:0 TYPE:MULTIPOLYGON DIMS:2 
 features.city_streets.the_geom SRID:0 TYPE:MULTILINESTRING DIMS:2 
 features.traffic_signs.the_geom SRID:0 TYPE:MULTIPOINT DIMS:2 

diff --git a/topology/test/regress/topogeo_addlinestring_expected b/topology/test/regress/topogeo_addlinestring_expected
index 76dcece9dd25579b3acdcd5eb8d8a9bc3d6f8009..96fd911187698c917377ab025a800cc94e9d8f58 100644 (file)
--- a/topology/test/regress/topogeo_addlinestring_expected
+++ b/topology/test/regress/topogeo_addlinestring_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 max|node|22
 max|edge|26
 ERROR:  Invalid geometry type (MULTILINESTRING) passed to TopoGeo_AddLinestring, expected LINESTRING

diff --git a/topology/test/regress/topogeo_addpoint_expected b/topology/test/regress/topogeo_addpoint_expected
index ce32d19ae25964d5bc676d961196f39d350fbf7f..f7e791d67a43f721b14ce0d7a74809497346f3e0 100644 (file)
--- a/topology/test/regress/topogeo_addpoint_expected
+++ b/topology/test/regress/topogeo_addpoint_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 ERROR:  Invalid geometry type (LINESTRING) passed to TopoGeo_AddPoint, expected POINT
 ERROR:  Invalid geometry type (MULTIPOINT) passed to TopoGeo_AddPoint, expected POINT
 ERROR:  No topology with name "invalid" in topology.topology

diff --git a/topology/test/regress/topogeo_addpolygon_expected b/topology/test/regress/topogeo_addpolygon_expected
index 8da1efa54d42e0e1ddc493b142a9e08c1beb8a8f..37dab4b2dd104dbc86af742d90821466c4813872 100644 (file)
--- a/topology/test/regress/topogeo_addpolygon_expected
+++ b/topology/test/regress/topogeo_addpolygon_expected
@@ -1,9 +1,7 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
 max|node|22
 max|edge|26
 max|face|9

diff --git a/topology/test/regress/topogeometry_type_expected b/topology/test/regress/topogeometry_type_expected
index c418d7f4186d1df5062d27d08569e96f098d3b3a..7763bb37967f8f402a0c21b8386ed6788b2ac567 100644 (file)
--- a/topology/test/regress/topogeometry_type_expected
+++ b/topology/test/regress/topogeometry_type_expected
@@ -1,14 +1,10 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 4
 features.big_parcels.the_geom SRID:0 TYPE:MULTIPOLYGON DIMS:2 
 5

diff --git a/topology/test/regress/topojson_expected b/topology/test/regress/topojson_expected
index edf09b8b4eb19f2b938435408286f3c5f99072c0..52407b0353d64a7be127b0da3d1b3f67af0f0614 100644 (file)
--- a/topology/test/regress/topojson_expected
+++ b/topology/test/regress/topojson_expected
@@ -1,14 +1,10 @@
-BEGIN
 t
 9
 22
 26
-COMMIT
-BEGIN
 1
 2
 3
-COMMIT
 4
 features.big_parcels.the_geom SRID:0 TYPE:MULTIPOLYGON DIMS:2 
 5