Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2343: Version field returns null when explicity projected from a JOIN in SELECT clause - based fix off of patch provided by Howard Kelsey. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.1.x@1533218 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Heath Thomann 2013-10-17 19:14:40 +00:00
parent 752d4c9594
commit dd4daaebca
8 changed files with 198 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java
View File

@ -1006,7 +1006,7 @@ public class FieldMapping
// OPENJPA-662: Version fields have NoneFieldStrategy -- hence they
// need special treatment
if (isVersion()) {
return getDefiningMapping().getVersion().load(null, store, res);
return getDefiningMapping().getVersion().load(null, store, res, joins);
}
return assertStrategy().loadProjection(store, fetch, res, joins);
}

6
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Version.java
View File

@ -26,6 +26,7 @@ import org.apache.openjpa.jdbc.schema.Column;
import org.apache.openjpa.jdbc.schema.ColumnIO;
import org.apache.openjpa.jdbc.schema.Index;
import org.apache.openjpa.jdbc.schema.Schemas;
import org.apache.openjpa.jdbc.sql.Joins;
import org.apache.openjpa.jdbc.sql.Result;
import org.apache.openjpa.jdbc.sql.RowManager;
import org.apache.openjpa.jdbc.sql.Select;
@ -343,6 +344,11 @@ public class Version
return assertStrategy().load(sm, store, res);
}
public Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
throws SQLException {
return assertStrategy().load(sm, store, res, joins);
}
public void afterLoad(OpenJPAStateManager sm, JDBCStore store) {
assertStrategy().afterLoad(sm, store);
}

7
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionStrategy.java
View File

@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.openjpa.jdbc.kernel.JDBCStore;
import org.apache.openjpa.jdbc.schema.Column;
import org.apache.openjpa.jdbc.sql.Joins;
import org.apache.openjpa.jdbc.sql.Result;
import org.apache.openjpa.jdbc.sql.Select;
import org.apache.openjpa.kernel.OpenJPAStateManager;
@ -55,6 +56,12 @@ public interface VersionStrategy
*/
public Object load(OpenJPAStateManager sm, JDBCStore store, Result res)
throws SQLException;
/**
* Load data.
*/
public Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
throws SQLException;
/**
* This method is called after data is loaded into the instance, in

8
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
View File

@ -19,13 +19,14 @@
package org.apache.openjpa.jdbc.meta.strats;
import java.sql.SQLException;
import java.util.Map;
import java.util.Collections;
import java.util.Map;
import org.apache.openjpa.jdbc.kernel.JDBCStore;
import org.apache.openjpa.jdbc.meta.ClassMapping;
import org.apache.openjpa.jdbc.meta.Version;
import org.apache.openjpa.jdbc.meta.VersionStrategy;
import org.apache.openjpa.jdbc.sql.Joins;
import org.apache.openjpa.jdbc.sql.Result;
import org.apache.openjpa.jdbc.sql.Select;
import org.apache.openjpa.kernel.OpenJPAStateManager;
@ -58,6 +59,11 @@ public abstract class AbstractVersionStrategy
return null;
}
public Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
throws SQLException {
return null;
}
public void afterLoad(OpenJPAStateManager sm, JDBCStore store) {
}

20
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
View File

@ -28,11 +28,13 @@ import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
import org.apache.openjpa.jdbc.kernel.JDBCStore;
import org.apache.openjpa.jdbc.meta.ClassMapping;
import org.apache.openjpa.jdbc.meta.VersionMappingInfo;
import org.apache.openjpa.jdbc.meta.strats.AbstractVersionStrategy;
import org.apache.openjpa.jdbc.schema.Column;
import org.apache.openjpa.jdbc.schema.ColumnIO;
import org.apache.openjpa.jdbc.schema.ForeignKey;
import org.apache.openjpa.jdbc.schema.Index;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.Joins;
import org.apache.openjpa.jdbc.sql.Result;
import org.apache.openjpa.jdbc.sql.Row;
import org.apache.openjpa.jdbc.sql.RowManager;
@ -257,16 +259,22 @@ public abstract class ColumnVersionStrategy
sel.select(vers.getColumns());
return true;
}
public Object load(OpenJPAStateManager sm, JDBCStore store, Result res)
throws SQLException {
return this.load(sm, store, res, null);
}
public Object load(OpenJPAStateManager sm, JDBCStore store, Result res)
public Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
throws SQLException {
// typically if one version column is in the result, they all are, so
// optimize by checking for the first one before doing any real work
Column[] cols = vers.getColumns();
if (!res.contains(cols[0]))
if (!res.contains(cols[0], joins)) {
return null;
}
Object version = populateFromResult(res);
Object version = populateFromResult(res, joins);
// OPENJPA-662 Allow a null StateManager because this method may just be
// invoked to get the result of projection query
@ -295,7 +303,7 @@ public abstract class ColumnVersionStrategy
return false;
Object memVersion = sm.getVersion();
Object dbVersion = populateFromResult(res);
Object dbVersion = populateFromResult(res, null);
boolean refresh = compare(memVersion, dbVersion) < 0;
if (updateVersion)
@ -326,14 +334,14 @@ public abstract class ColumnVersionStrategy
* @return a single Object or an array depending on whether using a single
* or multiple columns being used for representation.
*/
Object populateFromResult(Result res) throws SQLException {
Object populateFromResult(Result res, Joins joins) throws SQLException {
if (res == null)
return null;
Column[] cols = vers.getColumns();
Object[] values = new Object[cols.length];
for (int i = 0; i < cols.length; i++) {
values[i] = res.getObject(cols[i], -1, null);
values[i] = res.getObject(cols[i], null, joins);
}
return (cols.length == 1) ? values[0] : values;
}

40
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Author.java Normal file
View File

@ -0,0 +1,40 @@
/*
* 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.jpql.version;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Version;
@Entity
public class Author {
@Id
private int id;
@Version
private int version;
public int getId() { return id; }
public void setId(int id) { this.id = id; }
public int getVersion() { return version; }
public void setVersion(int version) { this.version = version; }
}

38
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/Document.java Normal file
View File

@ -0,0 +1,38 @@
/*
* 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.jpql.version;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
@Entity
public class Document {
@Id
private int id;
@ManyToOne
private Author author;
public int getId() { return id; }
public void setId(int id) { this.id = id; }
public Author getAuthor() { return author; }
public void setAuthor(Author author) { this.author = author; }
}

85
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java Normal file
View File

@ -0,0 +1,85 @@
/*
* 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.jpql.version;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
/**
* Verifies that the version field is returned when part of a join statement.
* See OPENJPA-2343.
*/
public class TestJoinVersionField extends SingleEMFTestCase {
public void setUp(){
setUp(CLEAR_TABLES, Author.class,Document.class);
createTestData();
}
public void testGetDocuments(){
EntityManager em = emf.createEntityManager();
String str = "SELECT doc FROM Document doc JOIN doc.author auth";
TypedQuery<Document> query = em.createQuery(str, Document.class);
List<Document> documentList = query.getResultList();
for (Document doc : documentList) {
assertEquals("Author version field should have a value of 1.",
1, doc.getAuthor().getVersion());
}
em.close();
}
/**
* Prior to OPENJPA-2343, the version field in the Author entity is returned
* as null.
*/
public void testGetDocumentsByExplicitAttributeSelection(){
EntityManager em = emf.createEntityManager();
String str = "SELECT doc.id, auth.id, auth.version FROM Document doc JOIN doc.author auth";
Query query = em.createQuery(str);
List<Object[]> objectList = query.getResultList();
for (Object[] objects : objectList) {
assertEquals("Author version field should have a value of 1.",1,objects[2]);
}
}
public void createTestData() {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
Author author = new Author();
author.setId(10);
em.persist(author);
Document document = new Document();
document.setId(2);
document.setAuthor(author);
em.persist(document);
em.getTransaction().commit();
em.close();
}
}