Return-Path: X-Original-To: apmail-openjpa-commits-archive@www.apache.org Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4CD71101E8 for ; Tue, 8 Oct 2013 16:50:40 +0000 (UTC) Received: (qmail 41624 invoked by uid 500); 8 Oct 2013 16:50:40 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 41571 invoked by uid 500); 8 Oct 2013 16:50:36 -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 41447 invoked by uid 99); 8 Oct 2013 16:50:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Oct 2013 16:50:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 08 Oct 2013 16:50:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EFAC223888A6; Tue, 8 Oct 2013 16:50:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1530347 - in /openjpa/branches/2.2.1.x: ./ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/ openjpa-persistence-jdbc/src/test/java/org/apache/op... Date: Tue, 08 Oct 2013 16:50:13 -0000 To: commits@openjpa.apache.org From: hthomann@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131008165013.EFAC223888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hthomann Date: Tue Oct 8 16:50:13 2013 New Revision: 1530347 URL: http://svn.apache.org/r1530347 Log: OPENJPA-2425: SELECT fields with @ExternalValues defined returns datastore values instead of unmapped fields - applied Albert Lee's patch to 2.2.1.x. Modified: openjpa/branches/2.2.1.x/ (props changed) openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/ (props changed) Propchange: openjpa/branches/2.2.1.x/ ------------------------------------------------------------------------------ Merged /openjpa/branches/2.1.x:r1530146 Modified: openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java?rev=1530347&r1=1530346&r2=1530347&view=diff ============================================================================== --- openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java (original) +++ openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java Tue Oct 8 16:50:13 2013 @@ -918,14 +918,18 @@ public class PCPath } Object ret; - if (_key) + if (_key) { // Map key is a java primitive type - // example: Map emps - ret = res.getObject(pstate.cols[0], - null, pstate.joins); - else - ret = pstate.field.loadProjection(ctx.store, ctx.fetch, res, - pstate.joins); + // example: Map emps + ret = res.getObject(pstate.cols[0], null, pstate.joins); + } else { + ret = pstate.field.loadProjection(ctx.store, ctx.fetch, res, pstate.joins); + } + + if (pstate.field.isExternalized()) { + ret = pstate.field.getFieldValue(ret, ctx.store.getContext()); + } + if (_cast != null) ret = Filters.convert(ret, _cast); return ret; Modified: openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java?rev=1530347&r1=1530346&r2=1530347&view=diff ============================================================================== --- openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java (original) +++ openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java Tue Oct 8 16:50:13 2013 @@ -18,6 +18,9 @@ */ package org.apache.openjpa.persistence.external; +import java.util.Iterator; +import java.util.List; + import javax.persistence.EntityManager; import javax.persistence.Query; @@ -55,6 +58,30 @@ public class TestExternalValues extends Assert.assertEquals("MEDIUM", aPrime.getS2()); Assert.assertEquals(true, aPrime.getUseStreaming()); + em.getTransaction().begin(); + + entity = new EntityA(); + entity.setS1("LARGE"); + entity.setS2("LARGE"); + entity.setUseStreaming(false); + em.persist(entity); + + em.getTransaction().commit(); + + q = em.createQuery("SELECT t0.id, t0.s1, t0._useStreaming, t0.s2 FROM EntityA t0 ORDER BY t0.s1 DESC"); + List res = q.getResultList(); + + Iterator itr = res.iterator(); + Object[] values = itr.next(); + Assert.assertEquals("SMALL", values[1]); + Assert.assertEquals(Boolean.TRUE, values[2]); + Assert.assertEquals("MEDIUM", values[3]); + + values = itr.next(); + Assert.assertEquals("LARGE", values[1]); + Assert.assertEquals(Boolean.FALSE, values[2]); + Assert.assertEquals("LARGE", values[3]); + em.close(); } Propchange: openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/ ------------------------------------------------------------------------------ Merged /openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany:r1530146