From 0dee28e6c190846ac50ea1cf34b3e454f928682e Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 9 Feb 2016 16:52:07 +0000 Subject: [PATCH] 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 --- regress/loader/Arc.select.sql | 6 +++--- regress/loader/ArcM.select.sql | 6 +++--- regress/loader/ArcZ.select.sql | 6 +++--- regress/loader/MultiPoint.select.sql | 2 +- regress/loader/MultiPointM.select.sql | 2 +- regress/loader/MultiPointZ.select.sql | 2 +- regress/loader/PointZ.select.sql | 2 +- regress/loader/Polygon.select.sql | 2 +- regress/loader/PolygonM.select.sql | 2 +- regress/loader/PolygonZ.select.sql | 2 +- regress/loader/TSIPolygon.select.sql | 2 +- regress/loader/TSTIPolygon.select.sql | 2 +- regress/loader/TSTPolygon.select.sql | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/regress/loader/Arc.select.sql b/regress/loader/Arc.select.sql index 0e14bd264..419b2ff5e 100644 --- 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 0e14bd264..419b2ff5e 100644 --- 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 0e14bd264..419b2ff5e 100644 --- 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 06ce9606f..c16d1b5c9 100644 --- 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 06ce9606f..c16d1b5c9 100644 --- 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 06ce9606f..c16d1b5c9 100644 --- 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 0300908d3..b7d92cc8c 100644 --- 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 06ce9606f..c16d1b5c9 100644 --- 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 06ce9606f..c16d1b5c9 100644 --- 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 06ce9606f..c16d1b5c9 100644 --- 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 e68081804..73e30751f 100644 --- 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 e68081804..73e30751f 100644 --- 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 e68081804..73e30751f 100644 --- 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; -- 2.40.0