Jeff Adams: Now runs all the normal regression tests with the -G option as well....

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

diff --git a/regress/loader/Arc-G.select.expected b/regress/loader/Arc-G.select.expected
new file mode 100644 (file)
index 0000000..540b97a
--- /dev/null
+++ b/regress/loader/Arc-G.select.expected
@@ -0,0 +1,6 @@
+0105000020E61000000200000001020000000200000000000000000000000000000000000000000000000000F03F000000000000F03F0102000000020000000000000000000840000000000000084000000000000010400000000000001040
+0105000020E61000000300000001020000000200000000000000000000000000000000000000000000000000F03F000000000000F03F0102000000020000000000000000000840000000000000084000000000000010400000000000001040010200000003000000000000000000244000000000000024400000000000001440000000000000144000000000000008400000000000000840
+0020000005000010E600000002000000000200000002000000000000000000000000000000003FF00000000000003FF00000000000000000000002000000024008000000000000400800000000000040100000000000004010000000000000
+0020000005000010E600000003000000000200000002000000000000000000000000000000003FF00000000000003FF00000000000000000000002000000024008000000000000400800000000000040100000000000004010000000000000000000000200000003402400000000000040240000000000004014000000000000401400000000000040080000000000004008000000000000
+SRID=4326;MULTILINESTRING((0 0,1 1),(3 3,4 4))
+SRID=4326;MULTILINESTRING((0 0,1 1),(3 3,4 4),(10 10,5 5,3 3))

diff --git a/regress/loader/Arc.select.sql b/regress/loader/Arc.select.sql
index c11025de205e851e738711d35fbe02fde811d724..9f17065940e490a64ecdd1400bcb2d526ac8b03e 100644 (file)
--- a/regress/loader/Arc.select.sql
+++ b/regress/loader/Arc.select.sql
@@ -1,3 +1,3 @@
-select ST_Ashexewkb(the_geom, 'NDR') from loadedshp;
-select ST_Ashexewkb(the_geom, 'XDR') from loadedshp;
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp;
+select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;

diff --git a/regress/loader/ArcM-G.select.expected b/regress/loader/ArcM-G.select.expected
new file mode 100644 (file)
index 0000000..1682778
--- /dev/null
+++ b/regress/loader/ArcM-G.select.expected
@@ -0,0 +1,3 @@
+0105000060E61000000300000001020000400200000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000F03F0000000000000040010200004002000000000000000000084000000000000008400000000000000840000000000000104000000000000010400000000000001040010200004003000000000000000000244000000000000024400000000000001440000000000000144000000000000014400000000000001840000000000000084000000000000008400000000000001C40
+0060000005000010E600000003004000000200000002000000000000000000000000000000003FF00000000000003FF00000000000003FF0000000000000400000000000000000400000020000000240080000000000004008000000000000400800000000000040100000000000004010000000000000401000000000000000400000020000000340240000000000004024000000000000401400000000000040140000000000004014000000000000401800000000000040080000000000004008000000000000401C000000000000
+SRID=4326;MULTILINESTRINGM((0 0 1,1 1 2),(3 3 3,4 4 4),(10 10 5,5 5 6,3 3 7))

diff --git a/regress/loader/ArcM.select.sql b/regress/loader/ArcM.select.sql
index c11025de205e851e738711d35fbe02fde811d724..9f17065940e490a64ecdd1400bcb2d526ac8b03e 100644 (file)
--- a/regress/loader/ArcM.select.sql
+++ b/regress/loader/ArcM.select.sql
@@ -1,3 +1,3 @@
-select ST_Ashexewkb(the_geom, 'NDR') from loadedshp;
-select ST_Ashexewkb(the_geom, 'XDR') from loadedshp;
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp;
+select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;

diff --git a/regress/loader/ArcZ-G.select.expected b/regress/loader/ArcZ-G.select.expected
new file mode 100644 (file)
index 0000000..f94dadd
--- /dev/null
+++ b/regress/loader/ArcZ-G.select.expected
@@ -0,0 +1,3 @@
+01050000E0E61000000300000001020000C00200000000000000000000000000000000000000000000000000F03F0000000000002240000000000000F03F000000000000F03F0000000000000040000000000000204001020000C0020000000000000000000840000000000000084000000000000008400000000000001C40000000000000104000000000000010400000000000001040000000000000184001020000C00300000000000000000024400000000000002440000000000000144000000000000014400000000000001440000000000000144000000000000018400000000000001040000000000000084000000000000008400000000000001C400000000000001040
+00E0000005000010E60000000300C000000200000002000000000000000000000000000000003FF000000000000040220000000000003FF00000000000003FF00000000000004000000000000000402000000000000000C000000200000002400800000000000040080000000000004008000000000000401C000000000000401000000000000040100000000000004010000000000000401800000000000000C0000002000000034024000000000000402400000000000040140000000000004014000000000000401400000000000040140000000000004018000000000000401000000000000040080000000000004008000000000000401C0000000000004010000000000000
+SRID=4326;MULTILINESTRING((0 0 1 9,1 1 2 8),(3 3 3 7,4 4 4 6),(10 10 5 5,5 5 6 4,3 3 7 4))

diff --git a/regress/loader/ArcZ.select.sql b/regress/loader/ArcZ.select.sql
index c11025de205e851e738711d35fbe02fde811d724..9f17065940e490a64ecdd1400bcb2d526ac8b03e 100644 (file)
--- a/regress/loader/ArcZ.select.sql
+++ b/regress/loader/ArcZ.select.sql
@@ -1,3 +1,3 @@
-select ST_Ashexewkb(the_geom, 'NDR') from loadedshp;
-select ST_Ashexewkb(the_geom, 'XDR') from loadedshp;
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp;
+select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;

diff --git a/regress/loader/MultiPoint-G.select.expected b/regress/loader/MultiPoint-G.select.expected
new file mode 100644 (file)
index 0000000..07ee1ee
--- /dev/null
+++ b/regress/loader/MultiPoint-G.select.expected
@@ -0,0 +1 @@
+SRID=4326;MULTIPOINT(0 1,9 -1,9 -1)

diff --git a/regress/loader/MultiPoint.select.sql b/regress/loader/MultiPoint.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..06ce9606f274c1392865925fa5d0ccaf82e8d6ba 100644 (file)
--- a/regress/loader/MultiPoint.select.sql
+++ b/regress/loader/MultiPoint.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;
 

diff --git a/regress/loader/MultiPointM-G.select.expected b/regress/loader/MultiPointM-G.select.expected
new file mode 100644 (file)
index 0000000..65c8116
--- /dev/null
+++ b/regress/loader/MultiPointM-G.select.expected
@@ -0,0 +1 @@
+SRID=4326;MULTIPOINTM(0 1 3,9 -1 -3,9 -1 -123)

diff --git a/regress/loader/MultiPointM.select.sql b/regress/loader/MultiPointM.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..06ce9606f274c1392865925fa5d0ccaf82e8d6ba 100644 (file)
--- a/regress/loader/MultiPointM.select.sql
+++ b/regress/loader/MultiPointM.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;
 

diff --git a/regress/loader/MultiPointZ-G.select.expected b/regress/loader/MultiPointZ-G.select.expected
new file mode 100644 (file)
index 0000000..8499913
--- /dev/null
+++ b/regress/loader/MultiPointZ-G.select.expected
@@ -0,0 +1 @@
+SRID=4326;MULTIPOINT(0 1 2 3,9 -1 -2 -3,9 -1 -20 -123)

diff --git a/regress/loader/MultiPointZ.select.sql b/regress/loader/MultiPointZ.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..06ce9606f274c1392865925fa5d0ccaf82e8d6ba 100644 (file)
--- a/regress/loader/MultiPointZ.select.sql
+++ b/regress/loader/MultiPointZ.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;
 

diff --git a/regress/loader/Point-G.select.expected b/regress/loader/Point-G.select.expected
new file mode 100644 (file)
index 0000000..ddf2ab4
--- /dev/null
+++ b/regress/loader/Point-G.select.expected
@@ -0,0 +1,3 @@
+SRID=4326;POINT(0 1)
+SRID=4326;POINT(9 -1)
+SRID=4326;POINT(9 -1)

diff --git a/regress/loader/Point.select.sql b/regress/loader/Point.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..06ce9606f274c1392865925fa5d0ccaf82e8d6ba 100644 (file)
--- a/regress/loader/Point.select.sql
+++ b/regress/loader/Point.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;
 

diff --git a/regress/loader/PointM-G.select.expected b/regress/loader/PointM-G.select.expected
new file mode 100644 (file)
index 0000000..542a4e8
--- /dev/null
+++ b/regress/loader/PointM-G.select.expected
@@ -0,0 +1,3 @@
+SRID=4326;POINTM(0 1 3)
+SRID=4326;POINTM(9 -1 -3)
+SRID=4326;POINTM(9 -1 -123)

diff --git a/regress/loader/PointM.select.sql b/regress/loader/PointM.select.sql
index 031c1196e4c2e974357069762719e7ed6236268a..14442a13b8fb5988ad08c947989f2e9f0c43e67b 100644 (file)
--- a/regress/loader/PointM.select.sql
+++ b/regress/loader/PointM.select.sql
@@ -1 +1 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;

diff --git a/regress/loader/PointZ-G.select.expected b/regress/loader/PointZ-G.select.expected
new file mode 100644 (file)
index 0000000..18085a6
--- /dev/null
+++ b/regress/loader/PointZ-G.select.expected
@@ -0,0 +1,3 @@
+SRID=4326;POINT(0 1 2 3)
+SRID=4326;POINT(9 -1 -2 -3)
+SRID=4326;POINT(9 -1 -20 -123)

diff --git a/regress/loader/PointZ.select.sql b/regress/loader/PointZ.select.sql
index 031c1196e4c2e974357069762719e7ed6236268a..14442a13b8fb5988ad08c947989f2e9f0c43e67b 100644 (file)
--- a/regress/loader/PointZ.select.sql
+++ b/regress/loader/PointZ.select.sql
@@ -1 +1 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;

diff --git a/regress/loader/Polygon-G.select.expected b/regress/loader/Polygon-G.select.expected
new file mode 100644 (file)
index 0000000..cf11df5
--- /dev/null
+++ b/regress/loader/Polygon-G.select.expected
@@ -0,0 +1 @@
+SRID=4326;MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(5 5,8 5,8 8,5 8,5 5)),((-1 -1,-1 -10,-10 -10,-10 -1,-1 -1),(-5 -5,-8 -5,-8 -8,-5 -8,-5 -5)))

diff --git a/regress/loader/Polygon.select.sql b/regress/loader/Polygon.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..06ce9606f274c1392865925fa5d0ccaf82e8d6ba 100644 (file)
--- a/regress/loader/Polygon.select.sql
+++ b/regress/loader/Polygon.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;
 

diff --git a/regress/loader/PolygonM-G.select.expected b/regress/loader/PolygonM-G.select.expected
new file mode 100644 (file)
index 0000000..d9ab70d
--- /dev/null
+++ b/regress/loader/PolygonM-G.select.expected
@@ -0,0 +1 @@
+SRID=4326;MULTIPOLYGONM(((0 0 1,0 10 7,10 10 5,10 0 3,0 0 1),(5 5 9,8 5 15,8 8 13,5 8 11,5 5 9)),((-1 -1 -1,-1 -10 -7,-10 -10 -5,-10 -1 -3,-1 -1 -1),(-5 -5 -9,-8 -5 -15,-8 -8 -13,-5 -8 -11,-5 -5 -9)))

diff --git a/regress/loader/PolygonM.select.sql b/regress/loader/PolygonM.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..06ce9606f274c1392865925fa5d0ccaf82e8d6ba 100644 (file)
--- a/regress/loader/PolygonM.select.sql
+++ b/regress/loader/PolygonM.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;
 

diff --git a/regress/loader/PolygonZ-G.select.expected b/regress/loader/PolygonZ-G.select.expected
new file mode 100644 (file)
index 0000000..75b9383
--- /dev/null
+++ b/regress/loader/PolygonZ-G.select.expected
@@ -0,0 +1 @@
+SRID=4326;MULTIPOLYGON(((0 0 0 1,0 10 6 7,10 10 4 5,10 0 2 3,0 0 0 1),(5 5 8 9,8 5 14 15,8 8 12 13,5 8 10 11,5 5 8 9)),((-1 -1 -1 -1,-1 -10 -6 -7,-10 -10 -4 -5,-10 -1 -2 -3,-1 -1 -1 -1),(-5 -5 -8 -9,-8 -5 -14 -15,-8 -8 -12 -13,-5 -8 -10 -11,-5 -5 -8 -9)))

diff --git a/regress/loader/PolygonZ.select.sql b/regress/loader/PolygonZ.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..06ce9606f274c1392865925fa5d0ccaf82e8d6ba 100644 (file)
--- a/regress/loader/PolygonZ.select.sql
+++ b/regress/loader/PolygonZ.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom::geometry) from loadedshp;
 

diff --git a/regress/run_test b/regress/run_test
index 8399794470df0d5c1a50f9e4dab1e02db154565e..2b4e4c817ae6401e03e6a0fc4082e4496f9bcabc 100755 (executable)
--- a/regress/run_test
+++ b/regress/run_test
@@ -337,6 +337,13 @@ run_loader_test ()
        else
                return 1
        fi
+       # If we have some expected files to compare with, run in geography mode.
+       if run_loader_and_check_output "geog test" "loadedshp" "${TEST}-G.sql.expected" "${TEST}-G.select.expected" \
+               "-G $_custom_opts"; then
+               :
+       else
+               return 1
+       fi
        # Always run in wkb ("normal") mode, even if there are no expected files to compare with.
        if run_loader_and_check_output "wkb test" "loadedshp" "${TEST}.sql.expected" "${TEST}.select.expected" \
                "$_custom_opts" "true"; then
@@ -353,6 +360,13 @@ run_loader_test ()
                else
                        return 1
                fi
+               # If we have some expected files to compare with, run in wkt dump mode.
+               if run_loader_and_check_output "geog dump test" "loadedshp" "${TEST}-GD.sql.expected" \
+                       "${TEST}-G.select.expected" "-G -D"; then
+                       :
+               else
+                       return 1
+               fi
                # If we have some expected files to compare with, run in wkb dump mode.
                if run_loader_and_check_output "wkb dump test" "loadedshp" "${TEST}-D.sql.expected" \
                        "${TEST}.select.expected" "-D"; then