Use stricter ordering in regression test query for pg_stat_io

The query introduced in 8b532771a099 is proving to have ordering issues
under at least the locale cs_CZ.  This commit updates the query to use a
stricter ordering.

Per reports from buildfarm members hippopotamus and jay.

diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out
index 2707f3400d982cd87a05013c5ce2e234da8cd306..30d763c4aee8029620a84781c9e1d7cc0da228d5 100644 (file)
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -14,7 +14,7 @@ SHOW track_counts;  -- must be on
 -- List of backend types, contexts and objects tracked in pg_stat_io.
 \a
 SELECT backend_type, object, context FROM pg_stat_io
-  ORDER BY backend_type, object, context COLLATE "C";
+  ORDER BY backend_type COLLATE "C", object COLLATE "C", context COLLATE "C";
 backend_type|object|context
 autovacuum launcher|relation|bulkread
 autovacuum launcher|relation|init

diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql
index 7e03af9316839915003cc11e484f01d428da6216..5e7ef20fef6e30952ac405ac5d513ce987a9695d 100644 (file)
--- a/src/test/regress/sql/stats.sql
+++ b/src/test/regress/sql/stats.sql
@@ -11,7 +11,7 @@ SHOW track_counts;  -- must be on
 -- List of backend types, contexts and objects tracked in pg_stat_io.
 \a
 SELECT backend_type, object, context FROM pg_stat_io
-  ORDER BY backend_type, object, context COLLATE "C";
+  ORDER BY backend_type COLLATE "C", object COLLATE "C", context COLLATE "C";
 \a
 
 -- ensure that both seqscan and indexscan plans are allowed