[Bast-commits] r5207 - in
SQL-Abstract/1.x/branches/1.50_RC-extraparens: . t
norbi at dev.catalyst.perl.org
norbi at dev.catalyst.perl.org
Wed Nov 26 21:03:30 GMT 2008
Author: norbi
Date: 2008-11-26 21:03:30 +0000 (Wed, 26 Nov 2008)
New Revision: 5207
Modified:
SQL-Abstract/1.x/branches/1.50_RC-extraparens/
SQL-Abstract/1.x/branches/1.50_RC-extraparens/t/10test.t
Log:
r5262 at vger: mendel | 2008-11-26 21:21:44 +0100
* Added more tests for SQLA::Test.
Property changes on: SQL-Abstract/1.x/branches/1.50_RC-extraparens
___________________________________________________________________
Name: svk:merge
- 4d5fae46-8e6a-4e08-abee-817e9fb894a2:/local/bast/SQL-Abstract/1.x/branches/1.50_RC:5202
4d5fae46-8e6a-4e08-abee-817e9fb894a2:/local/bast/SQL-Abstract/1.x/branches/1.50_RC-extraparens:5261
+ 4d5fae46-8e6a-4e08-abee-817e9fb894a2:/local/bast/SQL-Abstract/1.x/branches/1.50_RC:5202
4d5fae46-8e6a-4e08-abee-817e9fb894a2:/local/bast/SQL-Abstract/1.x/branches/1.50_RC-extraparens:5262
Modified: SQL-Abstract/1.x/branches/1.50_RC-extraparens/t/10test.t
===================================================================
--- SQL-Abstract/1.x/branches/1.50_RC-extraparens/t/10test.t 2008-11-26 21:03:25 UTC (rev 5206)
+++ SQL-Abstract/1.x/branches/1.50_RC-extraparens/t/10test.t 2008-11-26 21:03:30 UTC (rev 5207)
@@ -106,43 +106,60 @@
q/SELECT quux FROM bar WHERE a = 1/,
q/SELECT foo FROM quux WHERE a = 1/,
q/FOOBAR foo FROM bar WHERE a = 1/,
+
+ q/SELECT foo FROM bar WHERE a = 2/,
+ q/SELECT foo FROM bar WHERE a < 1/,
q/SELECT foo FROM bar WHERE b = 1/,
- q/SELECT foo FROM bar WHERE a = 2/,
+ q/SELECT foo FROM bar WHERE (c = 1)/,
+ q/SELECT foo FROM bar WHERE (d = 1)/,
+
q/SELECT foo FROM bar WHERE a = 1 AND quux/,
q/SELECT foo FROM bar WHERE a = 1 GROUP BY foo/,
q/SELECT foo FROM bar WHERE a = 1 ORDER BY foo/,
q/SELECT foo FROM bar WHERE a = 1 LIMIT 1/,
q/SELECT foo FROM bar WHERE a = 1 OFFSET 1/,
q/SELECT foo FROM bar JOIN quux WHERE a = 1/,
- q/SELECT foo FROM bar JOIN quux ON b = foo WHERE a = 1/,
- q/SELECT foo FROM bar JOIN quux ON (c = foo) WHERE a = 1/,
- q/SELECT foo FROM bar WHERE (c = 1)/,
- q/SELECT foo FROM bar WHERE (d = 1)/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 WHERE a = 1/,
]
},
{
equal => 0,
statements => [
q/SELECT foo FROM bar WHERE a = 1 AND b = 1/,
- q/SELECT foo FROM bar WHERE a = 1 AND a = 1/,
- q/SELECT foo FROM bar WHERE (b = 1 AND b = 1)/,
q/SELECT quux FROM bar WHERE a = 1 AND b = 1/,
q/SELECT foo FROM quux WHERE a = 1 AND b = 1/,
q/FOOBAR foo FROM bar WHERE a = 1 AND b = 1/,
+
q/SELECT foo FROM bar WHERE a = 2 AND b = 1/,
- q/SELECT foo FROM bar WHERE a = 1 AND quux AND b = 1/,
+ q/SELECT foo FROM bar WHERE a = 3 AND (b = 1)/,
+ q/SELECT foo FROM bar WHERE (a = 4) AND b = 1/,
+ q/SELECT foo FROM bar WHERE (a = 5) AND (b = 1)/,
+ q/SELECT foo FROM bar WHERE ((a = 6) AND (b = 1))/,
+ q/SELECT foo FROM bar WHERE ((a = 7) AND (b = 1))/,
+
+ q/SELECT foo FROM bar WHERE a = 1 AND b = 2/,
+ q/SELECT foo FROM bar WHERE a = 1 AND (b = 3)/,
+ q/SELECT foo FROM bar WHERE (a = 1) AND b = 4/,
+ q/SELECT foo FROM bar WHERE (a = 1) AND (b = 5)/,
+ q/SELECT foo FROM bar WHERE ((a = 1) AND (b = 6))/,
+ q/SELECT foo FROM bar WHERE ((a = 1) AND (b = 7))/,
+
+ q/SELECT foo FROM bar WHERE a < 1 AND b = 1/,
+ q/SELECT foo FROM bar WHERE b = 1 AND b = 1/,
+ q/SELECT foo FROM bar WHERE (c = 1) AND b = 1/,
+ q/SELECT foo FROM bar WHERE (d = 1) AND b = 1/,
+
+ q/SELECT foo FROM bar WHERE a = 1 AND b = 1 AND quux/,
q/SELECT foo FROM bar WHERE a = 1 AND b = 1 GROUP BY foo/,
q/SELECT foo FROM bar WHERE a = 1 AND b = 1 ORDER BY foo/,
q/SELECT foo FROM bar WHERE a = 1 AND b = 1 LIMIT 1/,
q/SELECT foo FROM bar WHERE a = 1 AND b = 1 OFFSET 1/,
q/SELECT foo FROM bar JOIN quux WHERE a = 1 AND b = 1/,
- q/SELECT foo FROM bar JOIN quux ON b = foo WHERE a = 1 AND b = 1/,
- q/SELECT foo FROM bar JOIN quux ON (c = foo) WHERE a = 1 AND b = 1/,
- q/SELECT foo FROM bar JOIN quux ON (d = foo) WHERE a = 1 AND b = 1/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 WHERE a = 1 AND b = 1/,
]
},
- # JOIN condition
+ # JOIN condition - equal
{
equal => 1,
statements => [
@@ -260,6 +277,67 @@
]
},
+ # JOIN condition - different
+ {
+ equal => 0,
+ statements => [
+ q/SELECT foo FROM bar JOIN quux ON a = 1 WHERE quuux/,
+ q/SELECT quux FROM bar JOIN quux ON a = 1 WHERE quuux/,
+ q/SELECT foo FROM quux JOIN quux ON a = 1 WHERE quuux/,
+ q/FOOBAR foo FROM bar JOIN quux ON a = 1 WHERE quuux/,
+
+ q/SELECT foo FROM bar JOIN quux ON a = 2 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON a < 1 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON b = 1 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON (c = 1) WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON (d = 1) WHERE quuux/,
+
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND quuux/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 GROUP BY foo/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 ORDER BY foo/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 LIMIT 1/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 OFFSET 1/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 JOIN quuux/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 JOIN quuux ON a = 1/,
+ ]
+ },
+ {
+ equal => 0,
+ statements => [
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND b = 1 WHERE quuux/,
+ q/SELECT quux FROM bar JOIN quux ON a = 1 AND b = 1 WHERE quuux/,
+ q/SELECT foo FROM quux JOIN quux ON a = 1 AND b = 1 WHERE quuux/,
+ q/FOOBAR foo FROM bar JOIN quux ON a = 1 AND b = 1 WHERE quuux/,
+
+ q/SELECT foo FROM bar JOIN quux ON a = 2 AND b = 1 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON a = 3 AND (b = 1) WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON (a = 4) AND b = 1 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON (a = 5) AND (b = 1) WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON ((a = 6) AND (b = 1)) WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON ((a = 7) AND (b = 1)) WHERE quuux/,
+
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND b = 2 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND (b = 3) WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON (a = 1) AND b = 4 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON (a = 1) AND (b = 5) WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON ((a = 1) AND (b = 6)) WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON ((a = 1) AND (b = 7)) WHERE quuux/,
+
+ q/SELECT foo FROM bar JOIN quux ON a < 1 AND b = 1 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON b = 1 AND b = 1 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON (c = 1) AND b = 1 WHERE quuux/,
+ q/SELECT foo FROM bar JOIN quux ON (d = 1) AND b = 1 WHERE quuux/,
+
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND b = 1 AND quuux/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND b = 1 GROUP BY foo/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND b = 1 ORDER BY foo/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND b = 1 LIMIT 1/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 AND b = 1 OFFSET 1/,
+ q/SELECT foo FROM bar JOIN quux JOIN quuux ON a = 1 AND b = 1/,
+ q/SELECT foo FROM bar JOIN quux ON a = 1 JOIN quuux ON a = 1 AND b = 1/,
+ ]
+ },
+
# DISTINCT ON (...) not confused with JOIN ON (...)
{
equal => 1,
@@ -301,6 +379,77 @@
q/SELECT DISTINCT ON (foo, quux) foo, quux FROM bar WHERE ( ( a = 1 ) )/,
]
},
+
+ # subselects - equal
+ {
+ equal => 1,
+ statements => [
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1)) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1)) AS foo WHERE (a = 1)/,
+ ]
+ },
+ {
+ equal => 1,
+ statements => [
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND c = 1) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND (c = 1)) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND c = 1) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND (c = 1)) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE ((b = 1) AND (c = 1))) AS foo WHERE a = 1/,
+
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND c = 1) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND (c = 1)) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND c = 1) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND (c = 1)) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE ((b = 1) AND (c = 1))) AS foo WHERE (a = 1)/,
+ ]
+ },
+
+ # subselects - different
+ {
+ equal => 0,
+ statements => [
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1) AS foo WHERE a = 2/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1) AS foo WHERE (a = 3)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1)) AS foo WHERE a = 4/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1)) AS foo WHERE (a = 5)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 2) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 3) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 4)) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 5)) AS foo WHERE (a = 1)/,
+ ]
+ },
+ {
+ equal => 0,
+ statements => [
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND c = 1) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND c = 2) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND (c = 3)) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND (c = 4)) AS foo WHERE a = 1/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE ((b = 1) AND (c = 5))) AS foo WHERE a = 1/,
+
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND c = 6) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND c = 7) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND (c = 8)) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND (c = 9)) AS foo WHERE (a = 1)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE ((b = 1) AND (c = 10))) AS foo WHERE (a = 1)/,
+
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND c = 1) AS foo WHERE a = 2/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND c = 2) AS foo WHERE a = 2/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND (c = 3)) AS foo WHERE a = 2/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND (c = 4)) AS foo WHERE a = 2/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE ((b = 1) AND (c = 5))) AS foo WHERE a = 2/,
+
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND c = 6) AS foo WHERE (a = 2)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND c = 7) AS foo WHERE (a = 2)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE b = 1 AND (c = 8)) AS foo WHERE (a = 2)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE (b = 1) AND (c = 9)) AS foo WHERE (a = 2)/,
+ q/SELECT * FROM (SELECT * FROM bar WHERE ((b = 1) AND (c = 10))) AS foo WHERE (a = 2)/,
+ ]
+ },
);
More information about the Bast-commits
mailing list