Author: fguillaume
Date: Tue Nov 3 19:13:33 2009
New Revision: 832516
URL: http://svn.apache.org/viewvc?rev=832516&view=rev
Log:
Always put multi-valued column reference last in BIN_OP_ANY
Modified:
incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
Modified:
incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
URL:
http://svn.apache.org/viewvc/incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g?rev=832516&r1=832515&r2=832516&view=diff
==============================================================================
---
incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
(original)
+++
incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
Tue Nov 3 19:13:33 2009
@@ -205,9 +205,9 @@
quantified_in_predicate:
ANY multi_valued_column_reference
( NOT IN LPAR in_value_list RPAR
- -> ^(BIN_OP_ANY NOT_IN multi_valued_column_reference in_value_list)
+ -> ^(BIN_OP_ANY NOT_IN in_value_list multi_valued_column_reference)
| IN LPAR in_value_list RPAR
- -> ^(BIN_OP_ANY IN multi_valued_column_reference in_value_list)
+ -> ^(BIN_OP_ANY IN in_value_list multi_valued_column_reference)
)
;
Modified:
incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
URL:
http://svn.apache.org/viewvc/incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite?rev=832516&r1=832515&r2=832516&view=diff
==============================================================================
---
incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
(original)
+++
incubator/chemistry/branches/0.62/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
Tue Nov 3 19:13:33 2009
@@ -91,7 +91,7 @@
"foo NOT IN ( 1, 2, 3)" -> (BIN_OP NOT_IN (COL foo) (LIST 1 2 3))
quantified_in_predicate:
-"ANY foo IN ('a', 1)" -> (BIN_OP_ANY IN (COL foo) (LIST 'a' 1))
+"ANY foo IN ('a', 1)" -> (BIN_OP_ANY IN (LIST 'a' 1) (COL foo))
comparison_predicate:
"foo = 1" -> (BIN_OP = (COL foo) 1)
