From 901b4b7ae213e160ee66cd76dbd893b9f0494fdb Mon Sep 17 00:00:00 2001
From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Mon, 9 Oct 2017 01:49:34 +0200
Subject: [PATCH] Remove unnecessary ORDER BY clauses from plpgsql tests

Some of the tests produce stable ordering even without the explicit
ORDER BY clauses, due to only using generate_series() and not any
distributed tables. So get rid of the unnecessary ORDER BY clauses.
---
 src/test/regress/expected/plpgsql.out | 22 +++++++++++-----------
 src/test/regress/sql/plpgsql.sql      | 10 +++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 6d256f44b8..9a05a05e3e 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -3530,7 +3530,7 @@ begin
   close c;
 end;
 $$ language plpgsql;
-select * from sc_test() order by 1;
+select * from sc_test();
  sc_test 
 ---------
        3
@@ -3552,7 +3552,7 @@ begin
   close c;
 end;
 $$ language plpgsql;
-select * from sc_test() order by 1;
+select * from sc_test();
  sc_test 
 ---------
       10
@@ -3597,10 +3597,9 @@ begin
     return next;
 end;
 $$ language plpgsql;
-select * from ret_query1() order by 1, 2;
+select * from ret_query1();
  column1 | column2 
 ---------+---------
-      -1 |      -2
       -1 |      -2
        1 |       0
        2 |      10
@@ -3613,6 +3612,7 @@ select * from ret_query1() order by 1, 2;
        9 |      80
       10 |      90
       11 |     100
+      -1 |      -2
 (13 rows)
 
 create type record_type as (x text, y int, z boolean);
@@ -3622,18 +3622,18 @@ begin
                  from generate_series(-8, lim) s (x) where s.x % 2 = 0;
 end;
 $$ language plpgsql;
-select * from ret_query2(8) order by 1;
+select * from ret_query2(8);
                 x                 | y  | z 
 ----------------------------------+----+---
- 0267aaf632e87a63288a08331f22c7c3 | -4 | f
- 1679091c5a880faf6fb5e6087eb1b2dc |  6 | t
+ a8d2ec85eaf98407310b72eb73dda247 | -8 | f
  596a3d04481816330f07e4f97510c28f | -6 | f
+ 0267aaf632e87a63288a08331f22c7c3 | -4 | f
  5d7b9adcbe1c629ec722529dd12e5129 | -2 | f
- a87ff679a2f3e71d9181a67b7542122c |  4 | t
- a8d2ec85eaf98407310b72eb73dda247 | -8 | f
+ cfcd208495d565ef66e7dff9f98764da |  0 | f
  c81e728d9d4c2f636f067f89cc14862c |  2 | t
+ a87ff679a2f3e71d9181a67b7542122c |  4 | t
+ 1679091c5a880faf6fb5e6087eb1b2dc |  6 | t
  c9f0f895fb98ab9159f51fd0297e236d |  8 | t
- cfcd208495d565ef66e7dff9f98764da |  0 | f
 (9 rows)
 
 -- test EXECUTE USING
@@ -3837,7 +3837,7 @@ begin
   return query execute 'select * from (values($1),($2)) f' using 40,50;
 end;
 $$ language plpgsql;
-select * from return_dquery() order by 1;
+select * from return_dquery();
  return_dquery 
 ---------------
             10
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index e48090207a..fdcffe7d65 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -2952,7 +2952,7 @@ begin
 end;
 $$ language plpgsql;
 
-select * from sc_test() order by 1;
+select * from sc_test();
 
 create or replace function sc_test() returns setof integer as $$
 declare
@@ -2969,7 +2969,7 @@ begin
 end;
 $$ language plpgsql;
 
-select * from sc_test() order by 1;
+select * from sc_test();
 
 drop function sc_test();
 
@@ -3007,7 +3007,7 @@ begin
 end;
 $$ language plpgsql;
 
-select * from ret_query1() order by 1, 2;
+select * from ret_query1();
 
 create type record_type as (x text, y int, z boolean);
 
@@ -3018,7 +3018,7 @@ begin
 end;
 $$ language plpgsql;
 
-select * from ret_query2(8) order by 1;
+select * from ret_query2(8);
 
 -- test EXECUTE USING
 create function exc_using(int, text) returns int as $$
@@ -3160,7 +3160,7 @@ begin
 end;
 $$ language plpgsql;
 
-select * from return_dquery() order by 1;
+select * from return_dquery();
 
 drop function return_dquery();
 
-- 
2.30.2