You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by ht...@apache.org on 2013/05/22 01:39:18 UTC
svn commit: r1485012 - in /openjpa/branches/2.2.1.x: ./
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/
Author: hthomann
Date: Tue May 21 23:39:18 2013
New Revision: 1485012
URL: http://svn.apache.org/r1485012
Log:
OPENJPA-2373: Made a test case update given identity auto generated ids do not work so well for some databases.
Modified:
openjpa/branches/2.2.1.x/ (props changed)
openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java
openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java
Propchange: openjpa/branches/2.2.1.x/
------------------------------------------------------------------------------
Merged /openjpa/branches/2.1.x:r1485010
Modified: openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java?rev=1485012&r1=1485011&r2=1485012&view=diff
==============================================================================
--- openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java (original)
+++ openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java Tue May 21 23:39:18 2013
@@ -26,11 +26,11 @@ import javax.persistence.Embeddable;
public class PartPK implements Serializable {
/*Textile Id*/
- @Column(name="ID_TXE", length=4)
+ @Column(name="ID_TXE")
private Integer textileId;
/*Part Number*/
- @Column(name="NU_PT", length=4)
+ @Column(name="NU_PT")
private Integer partNumber;
public PartPK() {
Modified: openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java?rev=1485012&r1=1485011&r2=1485012&view=diff
==============================================================================
--- openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java (original)
+++ openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java Tue May 21 23:39:18 2013
@@ -19,10 +19,19 @@
package org.apache.openjpa.persistence.inheritance.jointable.onetomany;
-import javax.naming.NamingException;
+import java.io.IOException;
+import java.sql.SQLException;
+
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.meta.MappingTool;
+import org.apache.openjpa.jdbc.meta.MappingTool.Flags;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.OracleDictionary;
+import org.apache.openjpa.jdbc.sql.SQLServerDictionary;
+import org.apache.openjpa.jdbc.sql.SybaseDictionary;
import org.apache.openjpa.persistence.common.apps.Part;
import org.apache.openjpa.persistence.common.apps.PartPK;
import org.apache.openjpa.persistence.common.apps.Shirt;
@@ -62,15 +71,31 @@ import org.apache.openjpa.persistence.te
*
*/
public class TestMapsIdWithAutoGeneratedKey extends SingleEMFTestCase {
+ boolean disabled = false;
+
public void setUp() {
super.setUp(DROP_TABLES,
Textile.class, TextilePK.class,
Shirt.class, Trousers.class,
Part.class, PartPK.class);
+
+ DBDictionary dic = ((JDBCConfiguration)emf.getConfiguration()).getDBDictionaryInstance();
+ if (!dic.supportsAutoAssign) {
+ disabled = true;
+ return;
+ }
+ if (dic instanceof SQLServerDictionary || dic instanceof OracleDictionary || dic instanceof SybaseDictionary) {
+ disabled = true;
+ return;
+ }
}
- public void testPersistShirtWithPart() throws NamingException {
+ public void testPersistShirtWithPart() {
+ if (disabled) {
+ return;
+ }
+
EntityManager em = emf.createEntityManager();
EntityTransaction tx = em.getTransaction();
int nPart = 3;