Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 49291 invoked from network); 8 Apr 2010 13:29:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Apr 2010 13:29:28 -0000 Received: (qmail 28641 invoked by uid 500); 8 Apr 2010 13:29:28 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 28621 invoked by uid 500); 8 Apr 2010 13:29:27 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 28614 invoked by uid 99); 8 Apr 2010 13:29:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 13:29:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 13:29:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9CA5B23889F1; Thu, 8 Apr 2010 13:29:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r931930 - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ Date: Thu, 08 Apr 2010 13:29:03 -0000 To: commits@cayenne.apache.org From: andrey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100408132903.9CA5B23889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andrey Date: Thu Apr 8 13:29:03 2010 New Revision: 931930 URL: http://svn.apache.org/viewvc?rev=931930&view=rev Log: CAY-1416 ExpressionFactory.noMatchExp.toEJBQL() produces incorrect output Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTNotEqual.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTest.java Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=931930&r1=931929&r2=931930&view=diff ============================================================================== --- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original) +++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Thu Apr 8 13:29:03 2010 @@ -49,6 +49,7 @@ Date: ---------------------------------- Bug Fixes Since 3.0RC3: +CAY-1416 ExpressionFactory.noMatchExp.toEJBQL() produces incorrect output CAY-1417 EJBQL doesn't support null numeric parameters ---------------------------------- Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTNotEqual.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTNotEqual.java?rev=931930&r1=931929&r2=931930&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTNotEqual.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTNotEqual.java Thu Apr 8 13:29:03 2010 @@ -76,7 +76,7 @@ public class ASTNotEqual extends Conditi //for ejbql, we need "is not null" instead of "!= null" return "is not"; } - return getExpressionOperator(index); + return "<>"; } @Override Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTest.java?rev=931930&r1=931929&r2=931930&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTest.java Thu Apr 8 13:29:03 2010 @@ -23,11 +23,11 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.Collections; +import junit.framework.TestCase; + import org.apache.art.Artist; import org.apache.cayenne.ObjectId; -import junit.framework.TestCase; - /** */ public class ExpressionTest extends TestCase { @@ -125,4 +125,18 @@ public class ExpressionTest extends Test assertEquals("x.artist = 1", ejbql); } + + public void testEncodeAsEJBQLNotEquals() { + + Expression e = Expression.fromString("artistName != 'bla'"); + + StringWriter buffer = new StringWriter(); + PrintWriter pw = new PrintWriter(buffer); + e.encodeAsEJBQL(pw, "x"); + pw.close(); + buffer.flush(); + String ejbql = buffer.toString(); + + assertEquals("x.artistName <> 'bla'", ejbql); + } }