Author: fguillaume
Date: Thu Jul 30 17:12:57 2009
New Revision: 799371
URL: http://svn.apache.org/viewvc?rev=799371&view=rev
Log:
CMIS-44: remove UPPER and LOWER CMIS-SQL functions
Modified:
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlLexer.g
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
Modified:
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlLexer.g
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlLexer.g?rev=799371&r1=799370&r2=799371&view=diff
==============================================================================
---
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlLexer.g
(original)
+++
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlLexer.g
Thu Jul 30 17:12:57 2009
@@ -90,8 +90,6 @@
SCORE : 'SCORE';
IN_FOLDER : 'IN_FOLDER';
IN_TREE : 'IN_TREE';
-UPPER : 'UPPER';
-LOWER : 'LOWER';
STAR : '*';
LPAR : '(';
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=799371&r1=799370&r2=799371&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 Jul 30 17:12:57 2009
@@ -81,8 +81,8 @@
;
string_value_function:
- ( f=UPPER | f=LOWER ) LPAR column_reference RPAR
- -> ^(FUNC $f column_reference)
+ ID LPAR column_reference RPAR
+ -> ^(FUNC ID column_reference)
;
numeric_value_function:
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=799371&r1=799370&r2=799371&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 Jul 30 17:12:57 2009
@@ -96,6 +96,7 @@
"foo IS NOT NULL" -> (UN_OP IS_NOT_NULL (COL foo))
"1 = ANY foo" -> (BIN_OP_ANY = 1 (COL foo))
"LOWER(foo) = 'bar'" -> (BIN_OP = (FUNC LOWER (COL foo)) 'bar')
+"quux(foo) = 'bar'" -> (BIN_OP = (FUNC quux (COL foo)) 'bar')
folder_predicate:
"IN_FOLDER(foo,'ID123')" -> (FUNC IN_FOLDER foo 'ID123')
