chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r833088 - in /incubator/chemistry/trunk: ./ chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/ chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/ chemistry/chemistry-ws/ jcr-cmis/server/atompub/
Date Thu, 05 Nov 2009 17:28:59 GMT
Author: fguillaume
Date: Thu Nov  5 17:28:58 2009
New Revision: 833088

URL: http://svn.apache.org/viewvc?rev=833088&view=rev
Log:
Merge from 0.62 branch: Always put multi-valued column reference last in BIN_OP_ANY, Remove
unneeded dependency

Modified:
    incubator/chemistry/trunk/   (props changed)
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
    incubator/chemistry/trunk/chemistry/chemistry-ws/pom.xml
    incubator/chemistry/trunk/jcr-cmis/server/atompub/   (props changed)

Propchange: incubator/chemistry/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 17:28:58 2009
@@ -1 +1 @@
-/incubator/chemistry/branches/0.62:812496-825562
+/incubator/chemistry/branches/0.62:812496-833086

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g?rev=833088&r1=833087&r2=833088&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
Thu Nov  5 17:28:58 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/trunk/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite?rev=833088&r1=833087&r2=833088&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
Thu Nov  5 17:28:58 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)

Modified: incubator/chemistry/trunk/chemistry/chemistry-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-ws/pom.xml?rev=833088&r1=833087&r2=833088&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-ws/pom.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-ws/pom.xml Thu Nov  5 17:28:58 2009
@@ -30,11 +30,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.chemistry</groupId>
-      <artifactId>chemistry-api</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
       <version>2.1</version>

Propchange: incubator/chemistry/trunk/jcr-cmis/server/atompub/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 17:28:58 2009
@@ -1,2 +1,2 @@
-/incubator/chemistry/branches/0.62/jcr-cmis/server/atompub:812496-825562
+/incubator/chemistry/branches/0.62/jcr-cmis/server/atompub:812496-833086
 /incubator/chemistry/trunk/jcr-cmis/server/atompub:770100-770103



Mime
View raw message