You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2010/01/28 22:57:48 UTC
svn commit: r904277 - in /openjpa/trunk:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/
Author: faywang
Date: Thu Jan 28 21:57:48 2010
New Revision: 904277
URL: http://svn.apache.org/viewvc?rev=904277&view=rev
Log:
OPENJPA-1486: lazily fetched embeddable should not be materialized in the query result
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java (with props)
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=904277&r1=904276&r2=904277&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java Thu Jan 28 21:57:48 2010
@@ -1025,8 +1025,13 @@
fetch.traverseJDBC(fms[i]), eres);
if (processed != eres)
res.putEager(fms[i], processed);
- } else
- fms[i].load(sm, this, fetch.traverseJDBC(fms[i]), res);
+ } else {
+ boolean lazyEmbeddable = fms[i].getValueMapping().isEmbedded() &&
+ fms[i].getEmbeddedMetaData() != null &&
+ fetch.requiresFetch(fms[i]) == FetchConfiguration.FETCH_NONE;
+ if (!lazyEmbeddable)
+ fms[i].load(sm, this, fetch.traverseJDBC(fms[i]), res);
+ }
} finally {
res.endDataRequest();
}
Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java?rev=904277&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java (added)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java Thu Jan 28 21:57:48 2010
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.embed;
+import java.io.Serializable;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="TBL7B")
+public class EntityA_Embed implements Serializable {
+ @Id
+ Integer id;
+
+ @Column(length=30)
+ String name;
+
+ @Basic(fetch=FetchType.LAZY)
+ int age;
+
+ @Embedded
+ protected Embed embed;
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Embed getEmbed() {
+ return embed;
+ }
+
+ public void setEmbed(Embed embed) {
+ this.embed = embed;
+ }
+}
+
Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java?rev=904277&r1=904276&r2=904277&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java Thu Jan 28 21:57:48 2010
@@ -36,6 +36,7 @@
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityTransaction;
+import javax.persistence.PersistenceUnitUtil;
import javax.persistence.Query;
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
@@ -44,7 +45,9 @@
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.OracleDictionary;
import org.apache.openjpa.persistence.ArgumentException;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.test.SQLListenerTestCase;
public class TestEmbeddable extends SQLListenerTestCase {
@@ -100,7 +103,7 @@
Embed_MappedToOne.class, Embed_MappedToOneCascadeDelete.class,
EntityA_Embed_MappedToOneCascadeDelete.class, EntityB2.class,
Book.class, Listing.class, Seller.class,
- EntityA_Embed_Coll_Map.class, Embed_Coll_Map.class,
+ EntityA_Embed_Coll_Map.class, Embed_Coll_Map.class, EntityA_Embed.class,
EntityA_Embed_Complex.class, A.class, CLEAR_TABLES);
sql.clear();
DBDictionary dict = ((JDBCConfiguration)emf.getConfiguration()).getDBDictionaryInstance();
@@ -922,6 +925,35 @@
assertNull(b);
em.close();
}
+
+ public void testLazyFetchEmbed() {
+ EntityManager em = emf.createEntityManager();
+ EntityA_Embed a = new EntityA_Embed();
+ a.setId(ID);
+ a.setName("name");
+ a.setAge(1);
+ Embed emb = new Embed();
+ emb.setIntVal1(1);
+ emb.setIntVal1(2);
+ emb.setIntVal1(3);
+ a.setEmbed(emb);
+ em.persist(a);
+ em.getTransaction().begin();
+ em.getTransaction().commit();
+ em.clear();
+
+ PersistenceUnitUtil puu = emf.getPersistenceUnitUtil();
+ OpenJPAEntityManager kem = OpenJPAPersistence.cast(em);
+ // do not fetch emb
+ kem.getFetchPlan().resetFetchGroups().removeFetchGroup("default")
+ .addField(EntityA_Embed.class, "name")
+ .addField(EntityA_Embed.class, "age");
+ a = em.find(EntityA_Embed.class, ID);
+ assertNotNull(a);
+ Embed embed = a.getEmbed();
+ assertNull(embed);
+ assertFalse(puu.isLoaded(a, "embed"));
+ }
/*
* Find EntityA_Embed_MappedToOne