summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane1998-10-28 19:32:43 +0000
committerTom Lane1998-10-28 19:32:43 +0000
commit1f27facc90c11c3e4c96b706ef64369842f1137c (patch)
treed73403b629fc495086fa676bea0fd3442e51124c
parent571d1216641b77dcb1e301eb887162c8b590581a (diff)
Add ORDER BY to ensure platform-independent results in rules test.
-rw-r--r--src/test/regress/expected/rules.out4
-rw-r--r--src/test/regress/sql/rules.sql6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index f77a532d6e2..c45ae096510 100644
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -311,12 +311,12 @@ bm |pluto
(3 rows)
QUERY: update rtest_person set pname = 'jwieck' where pdesc = 'Jan Wieck';
-QUERY: select * from rtest_admin;
+QUERY: select * from rtest_admin order by pname, sysname;
pname |sysname
------+-------
bm |pluto
-jwieck|orion
jwieck|notjw
+jwieck|orion
(3 rows)
QUERY: delete from rtest_system where sysname = 'orion';
diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql
index 8ffefd5be00..433e07a3a90 100644
--- a/src/test/regress/sql/rules.sql
+++ b/src/test/regress/sql/rules.sql
@@ -251,7 +251,11 @@ select * from rtest_admin;
update rtest_person set pname = 'jwieck' where pdesc = 'Jan Wieck';
-select * from rtest_admin;
+-- Note: use ORDER BY here to ensure consistent output across all systems.
+-- The above UPDATE affects two rows with equal keys, so they could be
+-- updated in either order depending on the whim of the local qsort().
+
+select * from rtest_admin order by pname, sysname;
delete from rtest_system where sysname = 'orion';