openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r813991 - in /openjpa/branches/1.3.x: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/
Date Fri, 11 Sep 2009 19:28:51 GMT
Author: dwoods
Date: Fri Sep 11 19:28:47 2009
New Revision: 813991

URL: http://svn.apache.org/viewvc?rev=813991&view=rev
Log:
OPENJPA-1184 Inverse relations not set for MapKey field when using parallel eager select.
 Patch and testcase contributed by David Minor.

Added:
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java
  (with props)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java
  (with props)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java
  (with props)
Modified:
    openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java

Modified: openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=813991&r1=813990&r2=813991&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
(original)
+++ openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
Fri Sep 11 19:28:47 2009
@@ -395,6 +395,8 @@
         for (int i = 0; i < fms.length; i++) {
             if (res.getEager(fms[i]) != null) {
                 Object coll =  owner.fetchObject(fms[i].getIndex());
+                if (coll instanceof Map)
+                    coll = ((Map)coll).values();
                 if (coll instanceof Collection && 
                     ((Collection) coll).size() > 0) {
                     // Found eagerly loaded collection.

Added: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java?rev=813991&view=auto
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java
(added)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java
Fri Sep 11 19:28:47 2009
@@ -0,0 +1,65 @@
+/*
+ * 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.relations;
+
+import java.io.Serializable;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class MapKeyChild implements Serializable {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    @Basic
+    @Column(length = 32)
+    private String mapKey;
+
+    @ManyToOne
+    @JoinColumn
+    private MapKeyParent parent;
+
+    public long getId() {
+        return id;
+    }
+
+    public MapKeyParent getParent() {
+        return this.parent;
+    }
+
+    public void setParent(MapKeyParent parent) {
+        this.parent = parent;
+    }
+
+    public String getMapKey() {
+        return this.mapKey;
+    }
+
+    public void setMapKey(String mapKey) {
+        this.mapKey = mapKey;
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java?rev=813991&view=auto
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java
(added)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java
Fri Sep 11 19:28:47 2009
@@ -0,0 +1,55 @@
+/*
+ * 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.relations;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+
+@Entity
+public class MapKeyParent implements Serializable {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @MapKey(name = "mapKey")
+    private Map<String, MapKeyChild> children;
+
+    public long getId() {
+        return id;
+    }
+
+    public Map<String, MapKeyChild> getChildren() {
+        return this.children;
+    }
+
+    public void setChildren(Map<String, MapKeyChild> children) {
+        this.children = children;
+    }
+
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java?rev=813991&view=auto
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java
(added)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java
Fri Sep 11 19:28:47 2009
@@ -0,0 +1,68 @@
+/*
+ * 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.relations;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestParallelEagerMap extends SingleEMFTestCase {
+
+    public void setUp() {
+        super.setUp(CLEAR_TABLES, MapKeyParent.class, MapKeyChild.class,
+            "openjpa.jdbc.EagerFetchMode", "parallel");
+    }
+
+    public void testParentNotNull() {
+
+        MapKeyParent[] parents = { new MapKeyParent(), new MapKeyParent() };
+        for (MapKeyParent parent : parents) {
+            Map<String, MapKeyChild> children =
+                new HashMap<String, MapKeyChild>();
+            for (String key : new String[] { "childA" }) {
+                MapKeyChild child = new MapKeyChild();
+                child.setParent(parent);
+                child.setMapKey(key);
+                children.put(key, child);
+            }
+            parent.setChildren(children);
+        }
+
+        OpenJPAEntityManager em = emf.createEntityManager();
+        em.getTransaction().begin();
+        for (MapKeyParent parent : parents) {
+            em.persist(parent);
+        }
+        em.getTransaction().commit();
+        em.close();
+
+        em = emf.createEntityManager();
+        MapKeyParent parent2 =
+            (MapKeyParent) em.createQuery(
+                "SELECT p FROM MapKeyParent p WHERE p.id=" + parents[0].getId()
+                    + " OR p.id=" + parents[1].getId()).getResultList().get(1);
+        em.close();
+
+        for (MapKeyChild child : parent2.getChildren().values()) {
+            assertNotNull("Parent should not be null", child.getParent());
+        }
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message