From: Pavan Deolasee <pavan.deolasee@gmail.com>
Date: Mon, 1 Feb 2016 10:55:50 +0000 (+0100)
Subject: Fix collate regression case by removing an ORDER BY (added in XL) which seems
X-Git-Tag: XL9_5_R1BETA1~43
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=bdccc6370de9db984345d766b41bc9243bfe7710;p=postgres-xl.git

Fix collate regression case by removing an ORDER BY (added in XL) which seems
to produce different results on different platforms.

Expected output adjusted accordingly
---

diff --git a/src/test/regress/expected/collate.out b/src/test/regress/expected/collate.out
index 13c252494e..2c037682f3 100644
--- a/src/test/regress/expected/collate.out
+++ b/src/test/regress/expected/collate.out
@@ -489,7 +489,7 @@ LINE 2:    (SELECT x FROM (VALUES('a' COLLATE "C"),('b')) t(x)
                    ^
 HINT:  Use the COLLATE clause to set the collation of the non-recursive term.
 SELECT a, b, a < b as lt FROM
-  (VALUES ('a', 'B'), ('A', 'b' COLLATE "C")) v(a,b) ORDER BY a;
+  (VALUES ('a', 'B'), ('A', 'b' COLLATE "C")) v(a,b);
  a | b | lt 
 ---+---+----
  a | B | f
diff --git a/src/test/regress/sql/collate.sql b/src/test/regress/sql/collate.sql
index a281921fe2..d663593111 100644
--- a/src/test/regress/sql/collate.sql
+++ b/src/test/regress/sql/collate.sql
@@ -161,7 +161,7 @@ WITH RECURSIVE foo(x) AS
 SELECT * FROM foo;
 
 SELECT a, b, a < b as lt FROM
-  (VALUES ('a', 'B'), ('A', 'b' COLLATE "C")) v(a,b) ORDER BY a;
+  (VALUES ('a', 'B'), ('A', 'b' COLLATE "C")) v(a,b);
 
 
 -- casting