Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 81648 invoked from network); 3 Nov 2009 05:12:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Nov 2009 05:12:39 -0000 Received: (qmail 52206 invoked by uid 500); 3 Nov 2009 05:12:39 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 52137 invoked by uid 500); 3 Nov 2009 05:12:39 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 52127 invoked by uid 99); 3 Nov 2009 05:12:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2009 05:12:38 +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; Tue, 03 Nov 2009 05:12:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E60BB23888DA; Tue, 3 Nov 2009 05:12:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r832300 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Date: Tue, 03 Nov 2009 05:12:14 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091103051214.E60BB23888DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ppoddar Date: Tue Nov 3 05:12:14 2009 New Revision: 832300 URL: http://svn.apache.org/viewvc?rev=832300&view=rev Log: Changed column name for Order.count to CNT to save HSQLDB Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java?rev=832300&r1=832299&r2=832300&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Tue Nov 3 05:12:14 2009 @@ -771,7 +771,7 @@ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.id IN (" + "SELECT DISTINCT t2.id " + "FROM CR_ODR t1 JOIN CR_ODR t2 ON (1 = 1), CR_LI t3 WHERE (" - + "t3.quantity > ? AND t2.count > ? AND t3.id = t2.id)))"; + + "t3.quantity > ? AND t2.cnt> ? AND t3.id = t2.id)))"; executeAndCompareSQL(jpql, expectedSQL); @@ -1426,7 +1426,7 @@ "FROM CR_ODR t0 " + "LEFT OUTER JOIN CR_CUST t2 ON t0.CUSTOMER_ID = t2.id " + "LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id " + - "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID WHERE (t0.count > (" + + "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID WHERE (t0.cnt> (" + "SELECT COUNT(t1.id) FROM CR_ODR t1))"; executeAndCompareSQL(jpql, expectedSQL); @@ -1453,7 +1453,7 @@ "FROM CR_ODR t0 " + "LEFT OUTER JOIN CR_CUST t2 ON t0.CUSTOMER_ID = t2.id " + "LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id " + - "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID WHERE (t0.count > (" + + "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID WHERE (t0.cnt> (" + "SELECT COUNT(t1.id) FROM CR_ODR t1))"; executeAndCompareSQL(jpql, expectedSQL); @@ -1518,7 +1518,7 @@ + "FROM CR_CUST t1 LEFT OUTER JOIN CR_ADDR t3 ON t1.ADDRESS_ID = t3.id " + "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID WHERE (NOT (EXISTS (" + "SELECT t0.id FROM CR_ACCT t0 WHERE (t0.CUSTOMER_ID = t1.id AND EXISTS (" - + "SELECT t2.id FROM CR_ODR t2 WHERE (t2.CUSTOMER_ID = t1.id AND t2.count = ?))))))"; + + "SELECT t2.id FROM CR_ODR t2 WHERE (t2.CUSTOMER_ID = t1.id AND t2.cnt= ?))))))"; executeAndCompareSQL(jpql, expectedSQL);