Remove unnecessary ORDER BY from privileges test

Some of the ORDER BY clauses added to the test are no longer necessary
as the queries produce stable results anyway (all rows are the same).
So remove the unnecessary clauses, to make the test more like upstream.

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 0db0a3ed5f26f27eb51b06d7c96e3b3e534e09f9..31ee5cc9832834f723ddda75af3ae1661ad9de64 100644 (file)
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -97,14 +97,14 @@ INSERT INTO atest1 SELECT 1, b FROM atest1; -- ok
 UPDATE atest1 SET a = 1 WHERE a = 2; -- ok
 UPDATE atest2 SET col2 = NOT col2; -- fail
 ERROR:  permission denied for relation atest2
-SELECT * FROM atest1 ORDER BY 1 FOR UPDATE; -- ok
+SELECT * FROM atest1 FOR UPDATE; -- ok
  a |  b  
 ---+-----
  1 | two
  1 | two
 (2 rows)
 
-SELECT * FROM atest2 ORDER BY 1 FOR UPDATE; -- fail
+SELECT * FROM atest2 FOR UPDATE; -- fail
 ERROR:  permission denied for relation atest2
 DELETE FROM atest2; -- fail
 ERROR:  permission denied for relation atest2
@@ -136,7 +136,7 @@ SELECT session_user, current_user;
  regress_user3 | regress_user3
 (1 row)
 
-SELECT * FROM atest1 ORDER BY 1; -- ok
+SELECT * FROM atest1; -- ok
  a |  b  
 ---+-----
  1 | two
@@ -177,7 +177,7 @@ SELECT * FROM atest2 WHERE ( col1 IN ( SELECT b FROM atest1 ) );
 ERROR:  permission denied for relation atest2
 SET SESSION AUTHORIZATION regress_user4;
 COPY atest2 FROM stdin; -- ok
-SELECT * FROM atest1 ORDER BY 1; -- ok
+SELECT * FROM atest1; -- ok
  a |  b  
 ---+-----
  1 | two

diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index a76e3d95c12ede5f22e8d331c9cab5722c2e31fc..0151e93c70262147ba84493dbba2bffe2647e0f1 100644 (file)
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -80,8 +80,8 @@ INSERT INTO atest2 VALUES ('foo', true); -- fail
 INSERT INTO atest1 SELECT 1, b FROM atest1; -- ok
 UPDATE atest1 SET a = 1 WHERE a = 2; -- ok
 UPDATE atest2 SET col2 = NOT col2; -- fail
-SELECT * FROM atest1 ORDER BY 1 FOR UPDATE; -- ok
-SELECT * FROM atest2 ORDER BY 1 FOR UPDATE; -- fail
+SELECT * FROM atest1 FOR UPDATE; -- ok
+SELECT * FROM atest2 FOR UPDATE; -- fail
 DELETE FROM atest2; -- fail
 TRUNCATE atest2; -- fail
 BEGIN;
@@ -98,7 +98,7 @@ SELECT * FROM atest2 WHERE ( col1 IN ( SELECT b FROM atest1 ) );
 SET SESSION AUTHORIZATION regress_user3;
 SELECT session_user, current_user;
 
-SELECT * FROM atest1 ORDER BY 1; -- ok
+SELECT * FROM atest1; -- ok
 SELECT * FROM atest2; -- fail
 INSERT INTO atest1 VALUES (2, 'two'); -- fail
 INSERT INTO atest2 VALUES ('foo', true); -- fail
@@ -124,7 +124,7 @@ SET SESSION AUTHORIZATION regress_user4;
 COPY atest2 FROM stdin; -- ok
 bar    true
 \.
-SELECT * FROM atest1 ORDER BY 1; -- ok
+SELECT * FROM atest1; -- ok
 
 
 -- test leaky-function protections in selfuncs