Do not rely on storage order on querying loaded shapefiles

Fixes runs with RUNTESTFLAGS=--dumprestore
See #3444

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

diff --git a/regress/loader/Arc.select.sql b/regress/loader/Arc.select.sql
index 0e14bd2643a59b0dc8fa106d7ecc30cf54cd7eb8..419b2ff5e41512b348201afe7b31600a8dec4444 100644 (file)
--- a/regress/loader/Arc.select.sql
+++ b/regress/loader/Arc.select.sql
@@ -1,3 +1,3 @@
-select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp order by 1;
-select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp order by 1;
-select ST_Asewkt(the_geom::geometry) from loadedshp order by 1;
+select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp order by gid;
+select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp order by gid;
+select ST_Asewkt(the_geom::geometry) from loadedshp order by gid;

diff --git a/regress/loader/ArcM.select.sql b/regress/loader/ArcM.select.sql
index 0e14bd2643a59b0dc8fa106d7ecc30cf54cd7eb8..419b2ff5e41512b348201afe7b31600a8dec4444 100644 (file)
--- a/regress/loader/ArcM.select.sql
+++ b/regress/loader/ArcM.select.sql
@@ -1,3 +1,3 @@
-select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp order by 1;
-select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp order by 1;
-select ST_Asewkt(the_geom::geometry) from loadedshp order by 1;
+select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp order by gid;
+select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp order by gid;
+select ST_Asewkt(the_geom::geometry) from loadedshp order by gid;

diff --git a/regress/loader/ArcZ.select.sql b/regress/loader/ArcZ.select.sql
index 0e14bd2643a59b0dc8fa106d7ecc30cf54cd7eb8..419b2ff5e41512b348201afe7b31600a8dec4444 100644 (file)
--- a/regress/loader/ArcZ.select.sql
+++ b/regress/loader/ArcZ.select.sql
@@ -1,3 +1,3 @@
-select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp order by 1;
-select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp order by 1;
-select ST_Asewkt(the_geom::geometry) from loadedshp order by 1;
+select ST_Ashexewkb(the_geom::geometry, 'NDR') from loadedshp order by gid;
+select ST_Ashexewkb(the_geom::geometry, 'XDR') from loadedshp order by gid;
+select ST_Asewkt(the_geom::geometry) from loadedshp order by gid;

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

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

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

diff --git a/regress/loader/PointZ.select.sql b/regress/loader/PointZ.select.sql
index 0300908d39d87f6b3f7e1a202c4257b095d2ed17..b7d92cc8c41b361f56642a0bde2f7297463964eb 100644 (file)
--- a/regress/loader/PointZ.select.sql
+++ b/regress/loader/PointZ.select.sql
@@ -1 +1 @@
-select ST_Asewkt(the_geom::geometry) from loadedshp order by 1;
+select ST_Asewkt(the_geom::geometry) from loadedshp order by gid;

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

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

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

diff --git a/regress/loader/TSIPolygon.select.sql b/regress/loader/TSIPolygon.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..73e30751fd1b5ec8769f43ee96aaeafbf2979339 100644 (file)
--- a/regress/loader/TSIPolygon.select.sql
+++ b/regress/loader/TSIPolygon.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom) from loadedshp ORDER BY gid;
 

diff --git a/regress/loader/TSTIPolygon.select.sql b/regress/loader/TSTIPolygon.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..73e30751fd1b5ec8769f43ee96aaeafbf2979339 100644 (file)
--- a/regress/loader/TSTIPolygon.select.sql
+++ b/regress/loader/TSTIPolygon.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom) from loadedshp ORDER BY gid;
 

diff --git a/regress/loader/TSTPolygon.select.sql b/regress/loader/TSTPolygon.select.sql
index e68081804e154cb25b468e5b7d0fb78524b8ca39..73e30751fd1b5ec8769f43ee96aaeafbf2979339 100644 (file)
--- a/regress/loader/TSTPolygon.select.sql
+++ b/regress/loader/TSTPolygon.select.sql
@@ -1,2 +1,2 @@
-select ST_Asewkt(the_geom) from loadedshp;
+select ST_Asewkt(the_geom) from loadedshp ORDER BY gid;