Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 50382 invoked from network); 7 Apr 2008 16:18:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Apr 2008 16:18:55 -0000 Received: (qmail 6938 invoked by uid 500); 7 Apr 2008 16:18:55 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 6929 invoked by uid 500); 7 Apr 2008 16:18:55 -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 6920 invoked by uid 99); 7 Apr 2008 16:18:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2008 09:18:55 -0700 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2008 16:18:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 35B3E1A9832; Mon, 7 Apr 2008 09:18:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r645589 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps: GetMapValue.java JDBCExpressionFactory.java Date: Mon, 07 Apr 2008 16:18:27 -0000 To: commits@openjpa.apache.org From: awhite@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080407161831.35B3E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: awhite Date: Mon Apr 7 09:18:26 2008 New Revision: 645589 URL: http://svn.apache.org/viewvc?rev=645589&view=rev Log: Fix for OPENJPA-554. Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java?rev=645589&r1=645588&r2=645589&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java Mon Apr 7 09:18:26 2008 @@ -45,15 +45,17 @@ private final Val _map; private final Val _key; + private final String _alias; private ClassMetaData _meta = null; private Class _cast = null; /** * Constructor. Provide the map and key to operate on. */ - public GetMapValue(Val map, Val key) { + public GetMapValue(Val map, Val key, String alias) { _map = map; _key = key; + _alias = alias; } public ClassMetaData getMetaData() { @@ -111,7 +113,8 @@ public void select(Select sel, ExpContext ctx, ExpState state, boolean pks) { - sel.select(newSQLBuffer(sel, ctx, state), this); + sel.select(newSQLBuffer(sel, ctx, state).append(" AS ").append(_alias), + this); } public void selectColumns(Select sel, ExpContext ctx, ExpState state, @@ -127,7 +130,7 @@ public void orderBy(Select sel, ExpContext ctx, ExpState state, boolean asc) { - sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false); + sel.orderBy(_alias, asc, false); } private SQLBuffer newSQLBuffer(Select sel, ExpContext ctx, ExpState state) { Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java?rev=645589&r1=645588&r2=645589&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java Mon Apr 7 09:18:26 2008 @@ -58,6 +58,7 @@ private final ClassMapping _type; private final SelectConstructor _cons = new SelectConstructor(); + private int _getMapValueAlias = 0; /** * Constructor. Supply the type we're querying against. @@ -396,6 +397,7 @@ } public Value getMapValue(Value map, Value arg) { - return new GetMapValue((Val) map, (Val) arg); + return new GetMapValue((Val) map, (Val) arg, + "gmv" + _getMapValueAlias++); } }