Tighten up a couple of regression test cases that can have platform-dependent

results due to underspecified ordering.  Per report from buildfarm member
pika.

diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out
index ee16087b92c95602c47206d7a5db54b4ede9bb08..8454d82183b2434b44138ee2c355414221bea655 100644 (file)
--- a/src/test/regress/expected/window.out
+++ b/src/test/regress/expected/window.out
@@ -233,26 +233,27 @@ SELECT cume_dist() OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 W
                  1 |   3 |    3
 (10 rows)
 
-SELECT ntile(3) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
+SELECT ntile(3) OVER (ORDER BY ten, four), ten, four FROM tenk1 WHERE unique2 < 10;
  ntile | ten | four 
 -------+-----+------
      1 |   0 |    0
-     1 |   0 |    2
      1 |   0 |    0
+     1 |   0 |    2
      1 |   1 |    1
-     2 |   1 |    3
      2 |   1 |    1
+     2 |   1 |    3
      2 |   3 |    3
      3 |   4 |    0
      3 |   7 |    1
      3 |   9 |    1
 (10 rows)
 
-SELECT ntile(NULL) OVER (ORDER BY ten), ten, four FROM tenk1 LIMIT 1;
+SELECT ntile(NULL) OVER (ORDER BY ten, four), ten, four FROM tenk1 LIMIT 2;
  ntile | ten | four 
 -------+-----+------
        |   0 |    0
-(1 row)
+       |   0 |    0
+(2 rows)
 
 SELECT lag(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  lag | ten | four 

diff --git a/src/test/regress/sql/window.sql b/src/test/regress/sql/window.sql
index 1100de5afa40299ab8e7e4b3fc123d01f80f3bf6..82f8624e450c3fd1042196a961be3e01b83fd40e 100644 (file)
--- a/src/test/regress/sql/window.sql
+++ b/src/test/regress/sql/window.sql
@@ -54,9 +54,9 @@ SELECT percent_rank() OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk
 
 SELECT cume_dist() OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
 
-SELECT ntile(3) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
+SELECT ntile(3) OVER (ORDER BY ten, four), ten, four FROM tenk1 WHERE unique2 < 10;
 
-SELECT ntile(NULL) OVER (ORDER BY ten), ten, four FROM tenk1 LIMIT 1;
+SELECT ntile(NULL) OVER (ORDER BY ten, four), ten, four FROM tenk1 LIMIT 2;
 
 SELECT lag(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;