summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbbas2012-04-18 12:31:43 +0000
committerAbbas2012-04-18 12:31:43 +0000
commit82be269606d0a99c843cb1540b87358f86ae7a04 (patch)
tree9857798f56214c53544ca834e73d5dd679426f6f
parent88bb14328861f4b9462bec14b29f4b2eb222ec21 (diff)
Fix for test case select_implicit
When the test case is compared with the one in PG, we had, for some unknown reason, changed the column used to order rows in one of the queries. This patch reverts this change. Expected output is changed accordingly.
-rw-r--r--src/test/regress/expected/select_implicit_3.out45
-rw-r--r--src/test/regress/sql/select_implicit.sql2
2 files changed, 26 insertions, 21 deletions
diff --git a/src/test/regress/expected/select_implicit_3.out b/src/test/regress/expected/select_implicit_3.out
index b67c7f13c9..53b8b2259d 100644
--- a/src/test/regress/expected/select_implicit_3.out
+++ b/src/test/regress/expected/select_implicit_3.out
@@ -22,11 +22,11 @@ SELECT c, count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER
c | count
----------+-------
ABAB | 2
+ bbbb | 1
BBBB | 2
+ cccc | 2
CCCC | 2
XXXX | 1
- bbbb | 1
- cccc | 2
(6 rows)
-- w/o existing GROUP BY target using a relation name in GROUP BY clause
@@ -34,11 +34,11 @@ SELECT count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY
count
-------
2
+ 1
2
2
- 1
- 1
2
+ 1
(6 rows)
-- w/o existing GROUP BY target and w/o existing a different ORDER BY target
@@ -69,19 +69,19 @@ SELECT test_missing_target.b, count(*)
(4 rows)
-- w/o existing GROUP BY target
-SELECT c FROM test_missing_target ORDER BY c;
+SELECT c FROM test_missing_target ORDER BY a;
c
----------
+ XXXX
ABAB
ABAB
BBBB
BBBB
- CCCC
- CCCC
- XXXX
bbbb
cccc
cccc
+ CCCC
+ CCCC
(10 rows)
-- w/o existing ORDER BY target
@@ -106,11 +106,11 @@ SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
c | count
----------+-------
ABAB | 2
+ bbbb | 1
BBBB | 2
+ cccc | 2
CCCC | 2
XXXX | 1
- bbbb | 1
- cccc | 2
(6 rows)
-- group using reference number out of range
@@ -206,11 +206,15 @@ SELECT count(*) INTO TABLE test_missing_target2
FROM test_missing_target x, test_missing_target y
WHERE x.a = y.a
GROUP BY x.b ORDER BY x.b;
-ERROR: INTO clause not yet supported
SELECT * FROM test_missing_target2 ORDER BY 1;
-ERROR: relation "test_missing_target2" does not exist
-LINE 1: SELECT * FROM test_missing_target2 ORDER BY 1;
- ^
+ count
+-------
+ 1
+ 2
+ 3
+ 4
+(4 rows)
+
-- Functions and expressions
-- w/ existing GROUP BY target
SELECT a%2, count(b) FROM test_missing_target
@@ -318,14 +322,15 @@ SELECT count(x.b) INTO TABLE test_missing_target3
FROM test_missing_target x, test_missing_target y
WHERE x.a = y.a
GROUP BY x.b/2 ORDER BY x.b/2;
-ERROR: INTO clause not yet supported
SELECT * FROM test_missing_target3 ORDER BY 1;
-ERROR: relation "test_missing_target3" does not exist
-LINE 1: SELECT * FROM test_missing_target3 ORDER BY 1;
- ^
+ count
+-------
+ 1
+ 4
+ 5
+(3 rows)
+
-- Cleanup
DROP TABLE test_missing_target;
DROP TABLE test_missing_target2;
-ERROR: table "test_missing_target2" does not exist
DROP TABLE test_missing_target3;
-ERROR: table "test_missing_target3" does not exist
diff --git a/src/test/regress/sql/select_implicit.sql b/src/test/regress/sql/select_implicit.sql
index 4d66f48206..fa0c66896b 100644
--- a/src/test/regress/sql/select_implicit.sql
+++ b/src/test/regress/sql/select_implicit.sql
@@ -38,7 +38,7 @@ SELECT test_missing_target.b, count(*)
FROM test_missing_target GROUP BY b ORDER BY b;
-- w/o existing GROUP BY target
-SELECT c FROM test_missing_target ORDER BY c;
+SELECT c FROM test_missing_target ORDER BY a;
-- w/o existing ORDER BY target
SELECT count(*) FROM test_missing_target GROUP BY b ORDER BY b desc;