Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 68523 invoked from network); 27 Aug 2007 13:02:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Aug 2007 13:02:00 -0000 Received: (qmail 38515 invoked by uid 500); 27 Aug 2007 13:01:56 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 38489 invoked by uid 500); 27 Aug 2007 13:01:56 -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 38480 invoked by uid 99); 27 Aug 2007 13:01:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Aug 2007 06:01:56 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Mon, 27 Aug 2007 13:02:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C02B71A9832; Mon, 27 Aug 2007 06:01:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r570098 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java Date: Mon, 27 Aug 2007 13:01:39 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070827130139.C02B71A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Mon Aug 27 06:01:39 2007 New Revision: 570098 URL: http://svn.apache.org/viewvc?rev=570098&view=rev Log: JCR-1090: Superfluous AndQueryNode in query tree built by SQL parser Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java?rev=570098&r1=570097&r2=570098&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java Mon Aug 27 06:01:39 2007 @@ -255,7 +255,11 @@ } } - if (constraintNode.getNumOperands() > 0) { + if (constraintNode.getNumOperands() == 1) { + // attach operand to last path step + LocationStepQueryNode[] steps = pathNode.getPathSteps(); + steps[steps.length - 1].addPredicate(constraintNode.getOperands()[0]); + } else if (constraintNode.getNumOperands() > 1) { // attach constraint to last path step LocationStepQueryNode[] steps = pathNode.getPathSteps(); steps[steps.length - 1].addPredicate(constraintNode);