From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 29 Jul 2015 00:00:13 +0000 (-0400)
Subject: Prevent platform-dependent output row ordering in a new test query.
X-Git-Tag: REL9_6_BETA1~1607
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d0e8bc9e036bffb88b7598aa4d46b7368a10f0c;p=postgresql

Prevent platform-dependent output row ordering in a new test query.

Buildfarm indicates this is necessary.
---

diff --git a/src/test/regress/expected/rowsecurity.out b/src/test/regress/expected/rowsecurity.out
index b0f2565b60..b146da373c 100644
--- a/src/test/regress/expected/rowsecurity.out
+++ b/src/test/regress/expected/rowsecurity.out
@@ -2899,12 +2899,14 @@ SELECT row_security_active('current_check');
  f
 (1 row)
 
-SELECT most_common_vals FROM pg_stats where tablename = 'current_check';
-  most_common_vals   
----------------------
- 
- 
- {rls_regress_user1}
+SELECT attname, most_common_vals FROM pg_stats
+  WHERE tablename = 'current_check'
+  ORDER BY 1;
+  attname  |  most_common_vals   
+-----------+---------------------
+ currentid | 
+ payload   | 
+ rlsuser   | {rls_regress_user1}
 (3 rows)
 
 SET SESSION AUTHORIZATION rls_regress_user1;
@@ -2915,9 +2917,11 @@ SELECT row_security_active('current_check');
  t
 (1 row)
 
-SELECT most_common_vals FROM pg_stats where tablename = 'current_check';
- most_common_vals 
-------------------
+SELECT attname, most_common_vals FROM pg_stats
+  WHERE tablename = 'current_check'
+  ORDER BY 1;
+ attname | most_common_vals 
+---------+------------------
 (0 rows)
 
 --
diff --git a/src/test/regress/sql/rowsecurity.sql b/src/test/regress/sql/rowsecurity.sql
index 03f82987c4..54f2c89eda 100644
--- a/src/test/regress/sql/rowsecurity.sql
+++ b/src/test/regress/sql/rowsecurity.sql
@@ -1197,12 +1197,16 @@ SET SESSION AUTHORIZATION rls_regress_user0;
 ANALYZE current_check;
 -- Stats visible
 SELECT row_security_active('current_check');
-SELECT most_common_vals FROM pg_stats where tablename = 'current_check';
+SELECT attname, most_common_vals FROM pg_stats
+  WHERE tablename = 'current_check'
+  ORDER BY 1;
 
 SET SESSION AUTHORIZATION rls_regress_user1;
 -- Stats not visible
 SELECT row_security_active('current_check');
-SELECT most_common_vals FROM pg_stats where tablename = 'current_check';
+SELECT attname, most_common_vals FROM pg_stats
+  WHERE tablename = 'current_check'
+  ORDER BY 1;
 
 --
 -- Collation support