jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r794278 - in /jackrabbit/trunk/jackrabbit-spi-commons/src: main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java test/resources/org/apache/jackrabbit/spi/commons/query/sql2/test.sql2.txt
Date Wed, 15 Jul 2009 14:22:09 GMT
Author: mreutegg
Date: Wed Jul 15 14:22:09 2009
New Revision: 794278

URL: http://svn.apache.org/viewvc?rev=794278&view=rev
Log:
JCR-2137: Use type StaticOperand for fullTextSearchExpression

Modified:
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
    jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/org/apache/jackrabbit/spi/commons/query/sql2/test.sql2.txt

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java?rev=794278&r1=794277&r2=794278&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
Wed Jul 15 14:22:09 2009
@@ -331,19 +331,19 @@
                 if (readIf("*")) {
                     read(",");
                     c = factory.fullTextSearch(
-                            name, null, factory.literal(readString()));
+                            name, null, parseStaticOperand());
                 } else {
                     String selector = name;
                     name = readName();
                     read(",");
                     c = factory.fullTextSearch(
-                            selector, name, factory.literal(readString()));
+                            selector, name, parseStaticOperand());
                 }
             } else {
                 read(",");
                 c = factory.fullTextSearch(
                         getOnlySelectorName(), name,
-                        factory.literal(readString()));
+                        parseStaticOperand());
             }
         } else if ("ISSAMENODE".equalsIgnoreCase(functionName)) {
             String name = readName();

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/org/apache/jackrabbit/spi/commons/query/sql2/test.sql2.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/org/apache/jackrabbit/spi/commons/query/sql2/test.sql2.txt?rev=794278&r1=794277&r2=794278&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/org/apache/jackrabbit/spi/commons/query/sql2/test.sql2.txt
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/org/apache/jackrabbit/spi/commons/query/sql2/test.sql2.txt
Wed Jul 15 14:22:09 2009
@@ -86,6 +86,7 @@
 
 # 6.7.19 FullTextSearch (p 113)
 select * from test where contains(name, 'hello -world')
+select * from test where contains(name, $x)
 select * from test as t where contains(t.*, 'hello -world')
 select * from test as t where contains([t].name, 'hello -world')
 



Mime
View raw message