Switch to evaluating tests using psql with verbosity=terse

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

diff --git a/raster/test/regress/bug_test_car5_expected b/raster/test/regress/bug_test_car5_expected
index 2492ea8ed44688f13e3656360c4b63f6cd8796d6..5599f5954ab72e86f01ed83321b319051a33437b 100644 (file)
--- a/raster/test/regress/bug_test_car5_expected
+++ b/raster/test/regress/bug_test_car5_expected
@@ -1,7 +1,7 @@
 BEGIN
-NOTICE:  SRID value -1 converted to the officially unknown SRID value 0
-NOTICE:  SRID value -1 converted to the officially unknown SRID value 0
-NOTICE:  SRID value -1 converted to the officially unknown SRID value 0
+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

diff --git a/raster/test/regress/rt_histogram_expected b/raster/test/regress/rt_histogram_expected
index 778f6829ea335e2c083fd5ec7f344be20be88199..08e649024526f2211a652b5cd19697da03b2eb02 100644 (file)
--- a/raster/test/regress/rt_histogram_expected
+++ b/raster/test/regress/rt_histogram_expected
@@ -69,20 +69,15 @@ BEGIN
 -1.239|3.142|10|0.500
 SAVEPOINT
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-SQL function "st_histogram" statement 1
 ERROR:  RASTER_histogramCoverage: Could not get summary stats of coverage
 COMMIT
 RELEASE
 SAVEPOINT
-ERROR:  relation "test1" does not exist
-QUERY:  SELECT "rast" FROM "test1" WHERE "rast" IS NOT NULL
-SQL function "st_histogram" statement 1
+ERROR:  relation "test1" does not exist at character 20
 COMMIT
 RELEASE
 SAVEPOINT
-ERROR:  column "rast1" does not exist
-QUERY:  SELECT "rast1" FROM "test_histogram" WHERE "rast1" IS NOT NULL
-SQL function "st_histogram" statement 1
+ERROR:  column "rast1" does not exist at character 8
 COMMIT
 RELEASE
 COMMIT

diff --git a/raster/test/regress/rt_quantile_expected b/raster/test/regress/rt_quantile_expected
index e1beb135a4c9e3840d26ee75f96a14f1991c47b0..3db327582f6e931ac9442c4bf2473eced1e651d8 100644 (file)
--- a/raster/test/regress/rt_quantile_expected
+++ b/raster/test/regress/rt_quantile_expected
@@ -85,20 +85,15 @@ BEGIN
 3.142
 SAVEPOINT
 NOTICE:  Invalid band index (must use 1-based). Returning NULL
-SQL function "st_quantile" statement 1
 ERROR:  RASTER_quantileCoverage: Could not get summary stats of coverage
 COMMIT
 RELEASE
 SAVEPOINT
-ERROR:  relation "test_quantile1" does not exist
-QUERY:  SELECT "rast" FROM "test_quantile1" WHERE "rast" IS NOT NULL
-SQL function "st_quantile" statement 1
+ERROR:  relation "test_quantile1" does not exist at character 20
 COMMIT
 RELEASE
 SAVEPOINT
-ERROR:  column "rast2" does not exist
-QUERY:  SELECT "rast2" FROM "test_quantile" WHERE "rast2" IS NOT NULL
-SQL function "st_quantile" statement 1
+ERROR:  column "rast2" does not exist at character 8
 COMMIT
 RELEASE
 SAVEPOINT

diff --git a/raster/test/regress/rt_summarystats_expected b/raster/test/regress/rt_summarystats_expected
index adb459d3d17ef594d6be1c47787b183efc88a934..bdfd8ce763f1f3cfd3a27ca3cf9bb5214db19930 100644 (file)
--- a/raster/test/regress/rt_summarystats_expected
+++ b/raster/test/regress/rt_summarystats_expected
@@ -16,13 +16,11 @@ NOTICE:  Invalid band index (must use 1-based). Returning NULL
 COMMIT
 RELEASE
 SAVEPOINT
-ERROR:  relation "test1" does not exist
-QUERY:  SELECT "rast" FROM "test1" WHERE "rast" IS NOT NULL
+ERROR:  relation "test1" does not exist at character 20
 COMMIT
 RELEASE
 SAVEPOINT
-ERROR:  column "rast1" does not exist
-QUERY:  SELECT "rast1" FROM "test_summarystats" WHERE "rast1" IS NOT NULL
+ERROR:  column "rast1" does not exist at character 8
 COMMIT
 RELEASE
 COMMIT

diff --git a/raster/test/regress/rt_valuecount_expected b/raster/test/regress/rt_valuecount_expected
index d7f019d45164aae64f21abd79288e244b1c03271..2e623f564d8987cbc170aede008a4905519a20a7 100644 (file)
--- a/raster/test/regress/rt_valuecount_expected
+++ b/raster/test/regress/rt_valuecount_expected
@@ -38,13 +38,11 @@ NOTICE:  Invalid band index (must use 1-based). Returning NULL
 COMMIT
 RELEASE
 SAVEPOINT
-ERROR:  relation "test1" does not exist
-QUERY:  SELECT "rast" FROM "test1" WHERE "rast" IS NOT NULL
+ERROR:  relation "test1" does not exist at character 20
 COMMIT
 RELEASE
 SAVEPOINT
-ERROR:  column "rast1" does not exist
-QUERY:  SELECT "rast1" FROM "test" WHERE "rast1" IS NOT NULL
+ERROR:  column "rast1" does not exist at character 8
 COMMIT
 RELEASE
 COMMIT

diff --git a/regress/regress_expected b/regress/regress_expected
index 674adf3c98fbaf99e2568116328e580efbe7941d..6c409ad42855f05c8bfa0e9a4eabd40055fec08d 100644 (file)
--- a/regress/regress_expected
+++ b/regress/regress_expected
@@ -47,34 +47,21 @@
 47|GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0)),((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0),(5 5 0,7 5 0,7 7 0,5 7 0,5 5 0)),((0 0 1,10 0 1,10 10 1,0 10 1,0 0 1),(5 5 1,7 5 1,7 7 1,5 7 1,5 5 1),(1 1 1,2 1 1,2 2 1,1 2 1,1 1 1))),MULTILINESTRING((0 0 0,1 1 0,2 2 0,3 3 0,4 4 0),(0 0 0,1 1 0,2 2 0,3 3 0,4 4 0),(1 2 3,4 5 6,7 8 9,10 11 12,13 14 15)),MULTIPOINT(1 2 3,5 6 7,8 9 10,11 12 13))
 48|MULTIPOINT(-1 -2 -3,5.4 6.6 7.77,-5.4 -6.6 -7.77,1000000 1e-6 -1000000,-1.3e-6 -1.4e-5 0)
 49|GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))
-ERROR:  parse error - invalid geometry
-HINT:  "POINT()" <-- parse error at position 7 within geometry
-ERROR:  parse error - invalid geometry
-HINT:  "POINT(1)" <-- parse error at position 8 within geometry
-ERROR:  parse error - invalid geometry
-HINT:  "POINT(," <-- parse error at position 7 within geometry
-ERROR:  parse error - invalid geometry
-HINT:  "MULTIPOINT(," <-- parse error at position 12 within geometry
-ERROR:  parse error - invalid geometry
-HINT:  "POINT(a" <-- parse error at position 7 within geometry
-ERROR:  parse error - invalid geometry
-HINT:  "MULTIPOINT()" <-- parse error at position 12 within geometry
-ERROR:  geometry contains non-closed rings
-HINT:  "POLYGON( (0 0, 10 0, 10 10, 0 10)" <-- parse error at position 33 within geometry
-ERROR:  geometry contains non-closed rings
-HINT:  "... 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7)" <-- parse error at position 60 within geometry
-ERROR:  parse error - invalid geometry
-HINT:  "...INESTRING((0 0, 1 1),(0 0, 1 1, 2 2,)" <-- parse error at position 43 within geometry
-ERROR:  geometry has too many points
-HINT:  "POINT(1 2 3, 4 5 6)" <-- parse error at position 19 within geometry
-ERROR:  parse error - invalid geometry
-HINT:  "POINT(1 2 3 4 5" <-- parse error at position 15 within geometry
-ERROR:  geometry requires more points
-HINT:  "LINESTRING(1 1)" <-- parse error at position 15 within geometry
+ERROR:  parse error - invalid geometry at character 14
+ERROR:  parse error - invalid geometry at character 14
+ERROR:  parse error - invalid geometry at character 14
+ERROR:  parse error - invalid geometry at character 14
+ERROR:  parse error - invalid geometry at character 14
+ERROR:  parse error - invalid geometry at character 14
+ERROR:  geometry contains non-closed rings at character 24
+ERROR:  geometry contains non-closed rings at character 24
+ERROR:  parse error - invalid geometry at character 24
+ERROR:  geometry has too many points at character 23
+ERROR:  parse error - invalid geometry at character 23
+ERROR:  geometry requires more points at character 23
 62|POINT(inf 0)
 63|POINT(-inf 0)
-ERROR:  parse error - invalid geometry
-HINT:  "MULTIPOINT(1 1, 2 2" <-- parse error at position 19 within geometry
+ERROR:  parse error - invalid geometry at character 23
 65|t
 65a|t
 66|t
@@ -184,7 +171,6 @@ HINT:  "MULTIPOINT(1 1, 2 2" <-- parse error at position 19 within geometry
 163|POLYGON((0 0 0,1 0 0,1 1 0,0 1 0,0 0 0))
 164|POLYGON((0 0 0,1 0 0,1 1 0,0 1 0,0 0 1))
 ERROR:  geometry contains non-closed rings
-HINT:  "...(0 0 0, 1 0 0, 1 1 0, 0 1 0, 0 0.1 1)" <-- parse error at position 45 within geometry
 166|POINT EMPTY
 167|LINESTRING EMPTY
 168|POLYGON EMPTY

diff --git a/regress/run_test b/regress/run_test
index 333b9644f30897a7954221787bb0ef9f14e603c2..4af65bf41e76b5e070e4f17c121f5519ad49bb0b 100755 (executable)
--- a/regress/run_test
+++ b/regress/run_test
@@ -148,7 +148,7 @@ run_simple_sql ()
        TMPFILE="${TMPDIR}/test_${RUN}_tmp"
 
        # Dump output to a temp file.
-       ${PSQL} -tXA < "${_sql}" ${DB} > ${TMPFILE} 2>&1
+       ${PSQL} -v "VERBOSITY=terse" -tXA < "${_sql}" ${DB} > ${TMPFILE} 2>&1
        # Check if psql errored out.
        if [ $? -gt 0 ]; then
                fail "Unable to run sql script $_sql" "${TMPFILE}"
@@ -199,7 +199,7 @@ run_simple_test ()
        DIFFILE="${TMPDIR}/test_${RUN}_diff"
 
        # Use intermediate file to prevent MingW buffering problems
-       ${PSQL} -v "tmpfile='${TMPFILE}'" -tXA < "${_sql}" ${DB} 2>&1 \
+       ${PSQL} -v "VERBOSITY=terse" -v "tmpfile='${TMPFILE}'" -tXA < "${_sql}" ${DB} 2>&1 \
                | grep --binary-files=text -v "^$" \
                | grep --binary-files=text -v "^INSERT" \
                | grep --binary-files=text -v "^DELETE" \

diff --git a/regress/sql-mm-compoundcurve_expected b/regress/sql-mm-compoundcurve_expected
index 7273d6e3565db6cced825f72fc0799fe29eaefe2..832338d8ae1c6776ebea0f07ea5a458035abea5c 100644 (file)
--- a/regress/sql-mm-compoundcurve_expected
+++ b/regress/sql-mm-compoundcurve_expected
@@ -72,11 +72,8 @@ valid wkt compound curve 3|0109000000010000000102000000030000000CE586D73CF36240B
 valid wkt compound curve 4|0109000000020000000102000000030000009FE5797057376340E09398B1B2373BC05AAE0A165F0963409F6760A2493D3DC0DB6286DFB057634082D8A1B32F843EC0010800000005000000DB6286DFB057634082D8A1B32F843EC0DB6286DFB057634082D8A1B32F843EC075B4E4D0C60C634031FA5D1A371540C0D7197CED9B636340A3CB59A7630A41C050F4A72AC0FB6240974769FCE3CF41C0
 valid wkt compound curve 5|010900000003000000010800000003000000468280E724BC6340BF4B46210B973BC0F890AEA18D8063402D9664151D483CC0EED64BB6EE726340903CA5BDA0863AC0010200000004000000EED64BB6EE726340903CA5BDA0863AC09FE5797057376340E09398B1B2373BC05AAE0A165F0963409F6760A2493D3DC0DB6286DFB057634082D8A1B32F843EC0010800000005000000DB6286DFB057634082D8A1B32F843EC0DB6286DFB057634082D8A1B32F843EC075B4E4D0C60C634031FA5D1A371540C0D7197CED9B636340A3CB59A7630A41C050F4A72AC0FB6240974769FCE3CF41C0
 ERROR:  incontinuous compound curve
-HINT:  "....08116619, 151.86720784 -35.62414508)" <-- parse error at position 177 within geometry
 ERROR:  incontinuous compound curve
-HINT:  "....08116619, 151.86720784 -35.62414508)" <-- parse error at position 218 within geometry
 ERROR:  geometry must have an odd number of points
-HINT:  "....52589021, 153.72942375 -27.21757040)" <-- parse error at position 136 within geometry
 valid wkb compound curve 1|COMPOUNDCURVE((153.72942375 -27.2175704,152.29285719 -29.23940482,154.74034096 -30.51635287),(154.74034096 -30.51635287,152.39926953 -32.16574411,155.11278414 -34.08116619,151.86720784 -35.62414508))
 valid wkb compound curve 2|COMPOUNDCURVE((153.72942375 -27.2175704,152.29285719 -29.23940482,154.74034096 -30.51635287,152.39926953 -32.16574411,155.11278414 -34.08116619,151.86720784 -35.62414508))
 valid wkb compound curve 3|COMPOUNDCURVE((151.60117699 -27.32398274,151.22873381 -35.9433821,150.74987829 -27.80283826))
@@ -86,8 +83,5 @@ null response|
 minpoints issues - pass|01090000000100000001020000000200000000000000000000000000000000000000000000000000F03F000000000000F03F
 minpoints issues - pass|010900000001000000010800000003000000000000000000000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000F03F
 ERROR:  geometry requires more points
-HINT:  "COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1)" <-- parse error at position 37 within geometry
 ERROR:  geometry requires more points
-HINT:  "COMPOUNDCURVE(CIRCULARSTRING(0 0)" <-- parse error at position 33 within geometry
 ERROR:  geometry requires more points
-HINT:  "COMPOUNDCURVE((0 0)" <-- parse error at position 19 within geometry

diff --git a/regress/sql-mm-curvepoly_expected b/regress/sql-mm-curvepoly_expected
index c97be02cca7ee0b1a154f3e1d3a67430703558fb..3ef31d5a402407bd2c3a452a63511d230423f01e 100644 (file)
--- a/regress/sql-mm-curvepoly_expected
+++ b/regress/sql-mm-curvepoly_expected
@@ -77,21 +77,13 @@ valid wkt curve polygon 3|010A00000001000000010800000007000000CCDF061AD9F3614054
 valid wkt curve polygon 4|010A00000002000000010800000007000000CCDF061AD9F3614054093E6D99093EC0AB9085DBB6DD614081540229216040C0EBD7A828C33E62409BF026782A7E41C0000000C06BB2624000000020ADB440C08E632F616EAD6240C9F7B0BF1DD33DC09011EEC0DE4362407DD6672F76323EC0CCDF061AD9F3614054093E6D99093EC00102000000060000006844C4FE011B6240342E2993E0423FC0D45DAF9D93066240C4A0C305D62240C000000080AC31624000000020FBBE40C0000000E0107F6240000000C0A10440C04E1C0C14624C6240BF3FB6405C793FC06844C4FE011B6240342E2993E0423FC0
 valid wkt curve polygon 5|010A00000002000000010200000007000000CCDF061AD9F3614054093E6D99093EC0AB9085DBB6DD614081540229216040C0EBD7A828C33E62409BF026782A7E41C0000000C06BB2624000000020ADB440C08E632F616EAD6240C9F7B0BF1DD33DC09011EEC0DE4362407DD6672F76323EC0CCDF061AD9F3614054093E6D99093EC00109000000030000000108000000030000006844C4FE011B6240342E2993E0423FC0D45DAF9D93066240C4A0C305D62240C000000080AC31624000000020FBBE40C001020000000200000000000080AC31624000000020FBBE40C0000000E0107F6240000000C0A10440C0010800000003000000000000E0107F6240000000C0A10440C04E1C0C14624C6240BF3FB6405C793FC06844C4FE011B6240342E2993E0423FC0
 ERROR:  geometry contains non-closed rings
-HINT:  "... 143.62025166838282 -30.037497356076)" <-- parse error at position 286 within geometry
 ERROR:  geometry contains non-closed rings
-HINT:  "...46.38697244992585 -31.47406391572417)" <-- parse error at position 485 within geometry
 ERROR:  geometry contains non-closed rings
-HINT:  "...146.1209416055467 -30.19711586270431)" <-- parse error at position 249 within geometry
 ERROR:  geometry must have an odd number of points
-HINT:  "...3.62025166838282 -30.037497356076827)" <-- parse error at position 265 within geometry
 ERROR:  geometry must have an odd number of points
-HINT:  "...146.1209416055467 -30.19711586270431)" <-- parse error at position 263 within geometry
 ERROR:  incontinuous compound curve
-HINT:  "...44.84399355252685 -31.26123924022086)" <-- parse error at position 567 within geometry
 ERROR:  geometry contains non-closed rings
-HINT:  "...4.84399355252685 -30.76123924022086))" <-- parse error at position 647 within geometry
 ERROR:  geometry requires more points
-HINT:  "...45.55230712890625 -33.49203872680664)" <-- parse error at position 475 within geometry
 valid ewkb curve polygon 1|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768))
 valid ewkb curve polygon 2|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617,146.386972449926 -31.4740639157242,144.843993552527 -31.2612392402209))
 valid ewkb curve polygon 3|CURVEPOLYGON(CIRCULARSTRING(143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768))
@@ -99,6 +91,5 @@ valid ewkb curve polygon 4|CURVEPOLYGON(CIRCULARSTRING(143.620251668383 -30.0374
 valid ewkb curve polygon 5|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),COMPOUNDCURVE(CIRCULARSTRING(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066),(145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617),CIRCULARSTRING(147.970809936523 -32.0361862182617,146.386972449926 -31.4740639157242,144.843993552527 -31.2612392402209)))
 valid curve 6|010A0000000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000040000000000000000001040000000000000084000000000000010400000000000001440000000000000F03F000000000000104000000000000000000000000000000000010800000003000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F333333333333FB3F000000000000F03F
 ERROR:  geometry requires more points
-HINT:  "..., 1 4, 0 0)), (1.7 1, 1.4 0.4, 1.7 1)" <-- parse error at position 112 within geometry
 valid curve 8|010A0000000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000020000000000000000001040000000000000084000000000000000000000000000000000010800000003000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F333333333333FB3F000000000000F03F
 null response|

diff --git a/regress/tickets.sql b/regress/tickets.sql
index c87a564ee40a49d32f4028183f2ddc4ecaa256df..a99c26f0a15d2c9a20111a47ce87962ed196996d 100644 (file)
--- a/regress/tickets.sql
+++ b/regress/tickets.sql
@@ -624,4 +624,3 @@ DROP TABLE road_pg;
 
 -- Clean up
 DELETE FROM spatial_ref_sys;
-

diff --git a/regress/tickets_expected b/regress/tickets_expected
index 5f0e8216f875b1d32729ef1cee5d5363510b4101..5d780ad74cb87cf8f21ab2c9d1ccc7ffb340e4ab 100644 (file)
--- a/regress/tickets_expected
+++ b/regress/tickets_expected
@@ -23,7 +23,6 @@ ERROR:  Geometry argument does not have an 'M' ordinate
 #122|CIRCULARSTRING(220268 150415,220227 150505,220227 150406)
 #124a|COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,30 5),CIRCULARSTRING(30 5,34 56,67 89))
 ERROR:  incontinuous compound curve
-HINT:  "...0 6),CIRCULARSTRING(30 5,34 56,67 89)" <-- parse error at position 85 within geometry
 #145a|0103000020E610000000000000
 #145b|0
 #146|0|t|GEOMETRYCOLLECTION(LINESTRING(0 0,-1 -1),MULTIPOINT(1 2,2 3))
@@ -172,12 +171,12 @@ ERROR:  Geometry type (Polygon) does not match column type (MultiPolygon)
 #1305.1|POINT(10 10)
 #1305.2|t
 #1305.3|t
-ERROR:  MultiPolygon cannot contain MultiPoint element
-ERROR:  MultiLineString cannot contain MultiPoint element
-ERROR:  MultiPoint cannot contain MultiPoint element
-ERROR:  CompoundCurve cannot contain MultiPoint element
-ERROR:  MultiCurve cannot contain MultiPoint element
-ERROR:  MultiSurface cannot contain MultiPoint element
+ERROR:  MultiPolygon cannot contain MultiPoint element at character 8
+ERROR:  MultiLineString cannot contain MultiPoint element at character 8
+ERROR:  MultiPoint cannot contain MultiPoint element at character 8
+ERROR:  CompoundCurve cannot contain MultiPoint element at character 8
+ERROR:  MultiCurve cannot contain MultiPoint element at character 8
+ERROR:  MultiSurface cannot contain MultiPoint element at character 8
 #1453.1|t
 #1453.2|f
 #1454|t
@@ -203,12 +202,9 @@ ERROR:  transform: couldn't project point (180 90 0): tolerance condition error
 #1580.3|Point[B]
 #1596.1|public.road_pg.roads_geom SRID:3395 TYPE:POINT DIMS:2 
 ERROR:  invalid SRID: 330000 not found in spatial_ref_sys
-PL/pgSQL function "updategeometrysrid" line 4 at SQL statement
 #1596.3|3395
 ERROR:  invalid SRID: 999000 not found in spatial_ref_sys
-PL/pgSQL function "updategeometrysrid" line 4 at SQL statement
 #1596.5|3395
 NOTICE:  SRID value -1 converted to the officially unknown SRID value 0
-PL/pgSQL function "updategeometrysrid" line 4 at SQL statement
 #1596.6|public.road_pg.roads_geom SRID changed to 0
 #1596.7|0

diff --git a/regress/wkt_expected b/regress/wkt_expected
index 3913420e7f237b6559eef25ba1084c8f61d6bba8..58713dc0eba2dd7f2dae0c725180186c115429dd 100644 (file)
--- a/regress/wkt_expected
+++ b/regress/wkt_expected
@@ -1,52 +1,39 @@
 POINT EMPTY|POINT EMPTY|t
 ERROR:  parse error - invalid geometry
-HINT:  "POINT(EMPTY" <-- parse error at position 11 within geometry
 POINT(0 0)|POINT(0 0)|t
 POINT Z (0 0 0)|POINT Z (0 0 0)|t
 POINT M (0 0 0)|POINT M (0 0 0)|t
 POINT ZM (0 0 0 0)|POINT ZM (0 0 0 0)|t
 ERROR:  can not mix dimensionality in a geometry
-HINT:  "POINT ZM (0 0 0)" <-- parse error at position 16 within geometry
 ERROR:  parse error - invalid geometry
-HINT:  "POINT((" <-- parse error at position 7 within geometry
 MULTIPOINT EMPTY|MULTIPOINT EMPTY|t
 ERROR:  parse error - invalid geometry
-HINT:  "MULTIPOINT(EMPTY" <-- parse error at position 16 within geometry
 MULTIPOINT(0 0, 2 0)|MULTIPOINT(0 0,2 0)|t
 MULTIPOINT((0 0), (2 0))|MULTIPOINT(0 0,2 0)|t
 ERROR:  parse error - invalid geometry
-HINT:  "MULTIPOINT((0 0), (2 0), EMPTY" <-- parse error at position 30 within geometry
 MULTIPOINT Z ((0 0 0), (2 0 0))|MULTIPOINT Z (0 0 0,2 0 0)|t
 MULTIPOINT M ((0 0 0), (2 0 0))|MULTIPOINT M (0 0 0,2 0 0)|t
 MULTIPOINT ZM ((0 0 0 0), (2 0 0 0))|MULTIPOINT ZM (0 0 0 0,2 0 0 0)|t
 LINESTRING EMPTY|LINESTRING EMPTY|t
 ERROR:  parse error - invalid geometry
-HINT:  "LINESTRING(EMPTY" <-- parse error at position 16 within geometry
 LINESTRING(0 0, 1 1)|LINESTRING(0 0,1 1)|t
 ERROR:  parse error - invalid geometry
-HINT:  "LINESTRING((" <-- parse error at position 12 within geometry
 ERROR:  parse error - invalid geometry
-HINT:  "LINESTRING((" <-- parse error at position 12 within geometry
 LINESTRING Z (0 0 0, 1 1 0)|LINESTRING Z (0 0 0,1 1 0)|t
 LINESTRING M (0 0 0, 1 1 0)|LINESTRING M (0 0 0,1 1 0)|t
 LINESTRING ZM (0 0 0 0, 1 1 0 0)|LINESTRING ZM (0 0 0 0,1 1 0 0)|t
 MULTILINESTRING EMPTY|MULTILINESTRING EMPTY|t
 ERROR:  parse error - invalid geometry
-HINT:  "MULTILINESTRING(EMPTY" <-- parse error at position 21 within geometry
 ERROR:  parse error - invalid geometry
-HINT:  "MULTILINESTRING(0" <-- parse error at position 17 within geometry
 MULTILINESTRING((0 0, 2 0))|MULTILINESTRING((0 0,2 0))|t
 MULTILINESTRING((0 0, 2 0), (1 1, 2 2))|MULTILINESTRING((0 0,2 0),(1 1,2 2))|t
 ERROR:  parse error - invalid geometry
-HINT:  "...ESTRING((0 0, 2 0), (1 1, 2 2), EMPTY" <-- parse error at position 45 within geometry
 ERROR:  parse error - invalid geometry
-HINT:  "...STRING((0 0, 2 0), (1 1, 2 2), (EMPTY" <-- parse error at position 46 within geometry
 MULTILINESTRING Z ((0 0 0, 2 0 0), (1 1 0, 2 2 0))|MULTILINESTRING Z ((0 0 0,2 0 0),(1 1 0,2 2 0))|t
 MULTILINESTRING M ((0 0 0, 2 0 0), (1 1 0, 2 2 0))|MULTILINESTRING M ((0 0 0,2 0 0),(1 1 0,2 2 0))|t
 MULTILINESTRING ZM ((0 0 0 0, 2 0 0 0), (1 1 0 0, 2 2 0 0))|MULTILINESTRING ZM ((0 0 0 0,2 0 0 0),(1 1 0 0,2 2 0 0))|t
 POLYGON EMPTY|POLYGON EMPTY|t
 ERROR:  parse error - invalid geometry
-HINT:  "POLYGON(EMPTY" <-- parse error at position 13 within geometry
 POLYGON((0 0,1 0,1 1,0 1,0 0))|POLYGON((0 0,1 0,1 1,0 1,0 0))|t
 POLYGON((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2))|POLYGON((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2))|t
 POLYGON Z ((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0),(2 2 0,2 5 0,5 5 0,5 2 0,2 2 0))|POLYGON Z ((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0),(2 2 0,2 5 0,5 5 0,5 2 0,2 2 0))|t
@@ -54,48 +41,36 @@ POLYGON M ((0 0 0,10 0 0,10 10 0,0 10 0,0 0 0),(2 2 0,2 5 0,5 5 0,5 2 0,2 2 0))|
 POLYGON ZM ((0 0 0 2,10 0 0 2,10 10 0 2,0 10 0 2,0 0 0 2),(2 2 0 2,2 5 0 2,5 5 0 2,5 2 0 2,2 2 0 2))|POLYGON ZM ((0 0 0 2,10 0 0 2,10 10 0 2,0 10 0 2,0 0 0 2),(2 2 0 2,2 5 0 2,5 5 0 2,5 2 0 2,2 2 0 2))|t
 MULTIPOLYGON EMPTY|MULTIPOLYGON EMPTY|t
 ERROR:  parse error - invalid geometry
-HINT:  "MULTIPOLYGON(EMPTY" <-- parse error at position 18 within geometry
 ERROR:  parse error - invalid geometry
-HINT:  "MULTIPOLYGON((EMPTY" <-- parse error at position 19 within geometry
 MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2)))|MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2)))|t
 MULTIPOLYGON Z (((0 0 2,10 0 2,10 10 2,0 10 2,0 0 2),(2 2 2,2 5 2,5 5 2,5 2 2,2 2 2)))|MULTIPOLYGON Z (((0 0 2,10 0 2,10 10 2,0 10 2,0 0 2),(2 2 2,2 5 2,5 5 2,5 2 2,2 2 2)))|t
 MULTIPOLYGON M (((0 0 2,10 0 2,10 10 2,0 10 2,0 0 2),(2 2 2,2 5 2,5 5 2,5 2 2,2 2 2)))|MULTIPOLYGON M (((0 0 2,10 0 2,10 10 2,0 10 2,0 0 2),(2 2 2,2 5 2,5 5 2,5 2 2,2 2 2)))|t
 MULTIPOLYGON ZM (((0 0 2 5,10 0 2 5,10 10 2 5,0 10 2 5,0 0 2 5),(2 2 2 5,2 5 2 5,5 5 2 5,5 2 2 5,2 2 2 5)))|MULTIPOLYGON ZM (((0 0 2 5,10 0 2 5,10 10 2 5,0 10 2 5,0 0 2 5),(2 2 2 5,2 5 2 5,5 5 2 5,5 2 2 5,2 2 2 5)))|t
 GEOMETRYCOLLECTION EMPTY|GEOMETRYCOLLECTION EMPTY|t
 ERROR:  parse error - invalid geometry
-HINT:  "GEOMETRYCOLLECTION(EMPTY" <-- parse error at position 24 within geometry
 ERROR:  parse error - invalid geometry
-HINT:  "GEOMETRYCOLLECTION((" <-- parse error at position 20 within geometry
 GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2))),POINT(0 0),MULTILINESTRING((0 0, 2 0),(1 1, 2 2)))|GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2))),POINT(0 0),MULTILINESTRING((0 0,2 0),(1 1,2 2)))|t
 GEOMETRYCOLLECTION Z (MULTIPOLYGON Z (((0 0 5,10 0 5,10 10 5,0 10 5,0 0 5),(2 2 5,2 5 5,5 5 5,5 2 5,2 2 5))),POINT Z (0 0 5),MULTILINESTRING Z ((0 0 5, 2 0 5),(1 1 5, 2 2 5)))|GEOMETRYCOLLECTION Z (MULTIPOLYGON Z (((0 0 5,10 0 5,10 10 5,0 10 5,0 0 5),(2 2 5,2 5 5,5 5 5,5 2 5,2 2 5))),POINT Z (0 0 5),MULTILINESTRING Z ((0 0 5,2 0 5),(1 1 5,2 2 5)))|t
 GEOMETRYCOLLECTION M (MULTIPOLYGON M (((0 0 5,10 0 5,10 10 5,0 10 5,0 0 5),(2 2 5,2 5 5,5 5 5,5 2 5,2 2 5))),POINT M (0 0 5),MULTILINESTRING M ((0 0 5, 2 0 5),(1 1 5, 2 2 5)))|GEOMETRYCOLLECTION M (MULTIPOLYGON M (((0 0 5,10 0 5,10 10 5,0 10 5,0 0 5),(2 2 5,2 5 5,5 5 5,5 2 5,2 2 5))),POINT M (0 0 5),MULTILINESTRING M ((0 0 5,2 0 5),(1 1 5,2 2 5)))|t
 GEOMETRYCOLLECTION ZM (MULTIPOLYGON ZM (((0 0 5 4,10 0 5 4,10 10 5 4,0 10 5 4,0 0 5 4),(2 2 5 4,2 5 5 4,5 5 5 4,5 2 5 4,2 2 5 4))),POINT ZM (0 0 5 4),MULTILINESTRING ZM ((0 0 5 4, 2 0 5 4),(1 1 5 4, 2 2 5 4)))|GEOMETRYCOLLECTION ZM (MULTIPOLYGON ZM (((0 0 5 4,10 0 5 4,10 10 5 4,0 10 5 4,0 0 5 4),(2 2 5 4,2 5 5 4,5 5 5 4,5 2 5 4,2 2 5 4))),POINT ZM (0 0 5 4),MULTILINESTRING ZM ((0 0 5 4,2 0 5 4),(1 1 5 4,2 2 5 4)))|t
 ERROR:  parse error - invalid geometry
-HINT:  "CIRCULARSTRING(EMPTY" <-- parse error at position 20 within geometry
 ERROR:  parse error - invalid geometry
-HINT:  "CIRCULARSTRING((" <-- parse error at position 16 within geometry
 ERROR:  geometry requires more points
-HINT:  "CIRCULARSTRING(0 0, 1 1)" <-- parse error at position 24 within geometry
 CIRCULARSTRING EMPTY|CIRCULARSTRING EMPTY|t
 CIRCULARSTRING(0 0, 1 1, 3 3)|CIRCULARSTRING(0 0,1 1,3 3)|t
 CIRCULARSTRING Z (0 0 0, 1 1 0, 2 3 4)|CIRCULARSTRING Z (0 0 0,1 1 0,2 3 4)|t
 CIRCULARSTRING M (0 0 0, 1 1 0, 3 4 5)|CIRCULARSTRING M (0 0 0,1 1 0,3 4 5)|t
 CIRCULARSTRING ZM (0 0 0 0, 1 1 0 0, 1 2 3 4)|CIRCULARSTRING ZM (0 0 0 0,1 1 0 0,1 2 3 4)|t
 ERROR:  geometry requires more points
-HINT:  "COMPOUNDCURVE(CIRCULARSTRING(0 0,1 0)" <-- parse error at position 37 within geometry
 ERROR:  incontinuous compound curve
-HINT:  "...CIRCULARSTRING(0 0,1 1,1 0),(1 2,0 1)" <-- parse error at position 51 within geometry
 COMPOUNDCURVE EMPTY|COMPOUNDCURVE EMPTY|t
 COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))|COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))|t
 COMPOUNDCURVE M (CIRCULARSTRING M (0 0 2,1 1 2,1 0 2),(1 0 2,0 1 2))|COMPOUNDCURVE M (CIRCULARSTRING M (0 0 2,1 1 2,1 0 2),(1 0 2,0 1 2))|t
 COMPOUNDCURVE Z (CIRCULARSTRING Z (0 0 2,1 1 2,1 0 2),(1 0 2,0 1 2))|COMPOUNDCURVE Z (CIRCULARSTRING Z (0 0 2,1 1 2,1 0 2),(1 0 2,0 1 2))|t
 COMPOUNDCURVE ZM (CIRCULARSTRING ZM (0 0 2 5,1 1 2 6,1 0 2 5), (1 0 2 3,0 1 2 2), (0 1 2 2,30 1 2 2), CIRCULARSTRING ZM (30 1 2 2,12 1 2 6,1 10 2 5))|COMPOUNDCURVE ZM (CIRCULARSTRING ZM (0 0 2 5,1 1 2 6,1 0 2 5),(1 0 2 3,0 1 2 2),(0 1 2 2,30 1 2 2),CIRCULARSTRING ZM (30 1 2 2,12 1 2 6,1 10 2 5))|t
 ERROR:  incontinuous compound curve
-HINT:  "...CIRCULARSTRING(0 0,1 1,1 0),(1 2,0 1)" <-- parse error at position 65 within geometry
 ERROR:  geometry requires more points
-HINT:  "CURVEPOLYGON (COMPOUNDCURVE EMPTY" <-- parse error at position 33 within geometry
 ERROR:  geometry contains non-closed rings
-HINT:  "...IRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))" <-- parse error at position 66 within geometry
 CURVEPOLYGON EMPTY|CURVEPOLYGON EMPTY|t
 CURVEPOLYGON (COMPOUNDCURVE M (CIRCULARSTRING M (0 0 2,1 1 2,1 0 2),(1 0 2,0 1 2),(0 1 2, 0 0 2)))|CURVEPOLYGON M (COMPOUNDCURVE M (CIRCULARSTRING M (0 0 2,1 1 2,1 0 2),(1 0 2,0 1 2),(0 1 2,0 0 2)))|t
 CURVEPOLYGON (COMPOUNDCURVE Z (CIRCULARSTRING Z (0 0 2,1 1 2,1 0 2),(1 0 2,0 1 2, 0 0 2)))|CURVEPOLYGON Z (COMPOUNDCURVE Z (CIRCULARSTRING Z (0 0 2,1 1 2,1 0 2),(1 0 2,0 1 2,0 0 2)))|t
@@ -117,14 +92,12 @@ POLYHEDRALSURFACE M (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 0 0,0 0 0)),((0
 POLYHEDRALSURFACE Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 0 0,0 0 0)),((0 0 0,1 0 0,0 0 1,0 0 0)),((1 0 0,0 1 0,0 0 1,1 0 0)))|POLYHEDRALSURFACE Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 0 0,0 0 0)),((0 0 0,1 0 0,0 0 1,0 0 0)),((1 0 0,0 1 0,0 0 1,1 0 0)))|t
 POLYHEDRALSURFACE ZM (((0 0 0 0,0 0 1 0,0 1 0 2,0 0 0 0)),((0 0 0 0,0 1 0 0,1 0 0 4,0 0 0 0)),((0 0 0 0,1 0 0 0,0 0 1 6,0 0 0 0)),((1 0 0 0,0 1 0 0,0 0 1 0,1 0 0 0)))|POLYHEDRALSURFACE ZM (((0 0 0 0,0 0 1 0,0 1 0 2,0 0 0 0)),((0 0 0 0,0 1 0 0,1 0 0 4,0 0 0 0)),((0 0 0 0,1 0 0 0,0 0 1 6,0 0 0 0)),((1 0 0 0,0 1 0 0,0 0 1 0,1 0 0 0)))|t
 ERROR:  geometry contains non-closed rings
-HINT:  "TRIANGLE ((1 2 3,4 5 6,7 8 9,1 2 0))" <-- parse error at position 36 within geometry
 TRIANGLE EMPTY|TRIANGLE EMPTY|t
 TRIANGLE ((1 2 3,4 5 6,7 8 9,1 2 3))|TRIANGLE Z ((1 2 3,4 5 6,7 8 9,1 2 3))|t
 TRIANGLE M ((1 2 3,4 5 6,7 8 9,1 2 3))|TRIANGLE M ((1 2 3,4 5 6,7 8 9,1 2 3))|t
 TRIANGLE Z ((1 2 3,4 5 6,7 8 9,1 2 3))|TRIANGLE Z ((1 2 3,4 5 6,7 8 9,1 2 3))|t
 TRIANGLE ZM ((1 2 3 -1,4 5 6 -2,7 8 9 -3,1 2 3 -1))|TRIANGLE ZM ((1 2 3 -1,4 5 6 -2,7 8 9 -3,1 2 3 -1))|t
 ERROR:  geometry contains non-closed rings
-HINT:  "...(0 0 0 1, 0 1 0 2, 1 1 0 3, 0 1 0 1))" <-- parse error at position 87 within geometry
 TIN EMPTY|TIN EMPTY|t
 TIN ( ((0 0, 0 0, 0 1, 0 0)), ((0 0, 0 1, 1 1, 0 0)) )|TIN(((0 0,0 0,0 1,0 0)),((0 0,0 1,1 1,0 0)))|t
 TIN Z ( ((0 0 0, 0 0 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 0 0 0)) )|TIN Z (((0 0 0,0 0 1,0 1 0,0 0 0)),((0 0 0,0 1 0,1 1 0,0 0 0)))|t