Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 72627 invoked from network); 28 Nov 2006 09:55:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Nov 2006 09:55:17 -0000 Received: (qmail 46736 invoked by uid 500); 28 Nov 2006 09:55:25 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 46700 invoked by uid 500); 28 Nov 2006 09:55:23 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 46685 invoked by uid 99); 28 Nov 2006 09:55:22 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Nov 2006 01:55:20 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id EA2A11A984A; Tue, 28 Nov 2006 01:53:18 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r479968 - in /jackrabbit/trunk/jackrabbit/src: main/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java test/java/org/apache/jackrabbit/core/query/SimpleQueryTest.java Date: Tue, 28 Nov 2006 09:53:18 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061128095318.EA2A11A984A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Tue Nov 28 01:53:18 2006 New Revision: 479968 URL: http://svn.apache.org/viewvc?view=rev&rev=479968 Log: JCR-649: Like expression does not match line terminator in String Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/query/SimpleQueryTest.java Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java?view=diff&rev=479968&r1=479967&r2=479968 ============================================================================== --- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java (original) +++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java Tue Nov 28 01:53:18 2006 @@ -195,7 +195,7 @@ } } } - return Pattern.compile(regexp.toString()); + return Pattern.compile(regexp.toString(), Pattern.DOTALL); } /** Modified: jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/query/SimpleQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/query/SimpleQueryTest.java?view=diff&rev=479968&r1=479967&r2=479968 ============================================================================== --- jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/query/SimpleQueryTest.java (original) +++ jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/query/SimpleQueryTest.java Tue Nov 28 01:53:18 2006 @@ -279,6 +279,23 @@ checkResult(result, 1); } + public void testLikeWithLineTerminator() throws Exception { + Node n = testRootNode.addNode("node1"); + n.setProperty("value", new String[]{"foo\nbar"}); + + testRootNode.save(); + + String sql = "SELECT * FROM nt:base WHERE jcr:path LIKE '" + testRoot + "/%' AND value LIKE 'foo%bar'"; + Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL); + QueryResult result = q.execute(); + checkResult(result, 1); + + sql = "SELECT * FROM nt:base WHERE jcr:path LIKE '" + testRoot + "/%' AND value LIKE 'foo_bar'"; + q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL); + result = q.execute(); + checkResult(result, 1); + } + public void testNotEqual() throws Exception { Node n = testRootNode.addNode("node1"); n.setProperty("value", new String[]{"foo"});