You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jr...@apache.org on 2009/10/22 19:12:02 UTC
svn commit: r828786 - in
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence:
datacache/ datacache/common/apps/ exception/ jdbc/common/apps/ jdbc/oracle/
kernel/common/apps/
Author: jrbauer
Date: Thu Oct 22 17:12:01 2009
New Revision: 828786
URL: http://svn.apache.org/viewvc?rev=828786&view=rev
Log:
Modified same named entities to use unique table names. Also corrected an NPE in test cleanup which occurred when embeddable metadata was present in the metadata repository.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java Thu Oct 22 17:12:01 2009
@@ -81,10 +81,12 @@
for (ClassMapping mapping : ((ClassMapping[]) emf
.getConfiguration().getMetaDataRepositoryInstance()
.getMetaDatas())) {
- Query q =
- em.createNativeQuery("DROP TABLE "
- + mapping.getTable().getName());
- q.executeUpdate();
+ if (mapping.getTable() != null) {
+ Query q =
+ em.createNativeQuery("DROP TABLE "
+ + mapping.getTable().getName());
+ q.executeUpdate();
+ }
}
em.getTransaction().commit();
em.close();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java Thu Oct 22 17:12:01 2009
@@ -316,7 +316,7 @@
// Modify the record in the database in a separate transaction using
// native SQL so that the in-memory instance is not altered
em.getTransaction().begin();
- String sql = "UPDATE PObject SET NAME='" + MARKER_DATABASE
+ String sql = "UPDATE L2_PObject SET NAME='" + MARKER_DATABASE
+ "' WHERE id=" + oid;
em.createNativeQuery(sql).executeUpdate();
em.getTransaction().commit();
@@ -483,7 +483,7 @@
// delete the record in the database in a separate transaction using
// native SQL so that the in-memory instance is not altered
em.getTransaction().begin();
- String sql = "DELETE FROM PObject WHERE id="+oid;
+ String sql = "DELETE FROM L2_PObject WHERE id="+oid;
em.createNativeQuery(sql).executeUpdate();
em.getTransaction().commit();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java Thu Oct 22 17:12:01 2009
@@ -23,8 +23,10 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import javax.persistence.Entity;
+import javax.persistence.Table;
@Entity
+@Table(name="L2_AttachA")
public class AttachA
implements Serializable {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java Thu Oct 22 17:12:01 2009
@@ -21,8 +21,10 @@
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Entity;
+import javax.persistence.Table;
@Entity
+@Table(name="L2_AttachE")
public class AttachE
implements Serializable {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/PObject.java Thu Oct 22 17:12:01 2009
@@ -21,6 +21,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Table;
import javax.persistence.Version;
/**
@@ -31,6 +32,7 @@
*
*/
@Entity
+@Table(name="L2_PObject")
public class PObject {
@Id
@GeneratedValue
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/PObject.java Thu Oct 22 17:12:01 2009
@@ -21,6 +21,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Table;
import javax.persistence.Version;
/**
@@ -31,6 +32,7 @@
*
*/
@Entity
+@Table(name="EX_POBJECT")
public class PObject {
@Id
private long id;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java Thu Oct 22 17:12:01 2009
@@ -25,11 +25,12 @@
import javax.persistence.Entity;
import javax.persistence.Id;
+import javax.persistence.Table;
+
import java.lang.annotation.Annotation;
@Entity
-
-
+@Table(name="JDBC_AttachA")
public class AttachA
implements Serializable, PreDetachCallback,
PostDetachCallback, PreAttachCallback, PostAttachCallback {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java Thu Oct 22 17:12:01 2009
@@ -25,9 +25,12 @@
import javax.persistence.Entity;
import javax.persistence.Id;
+import javax.persistence.Table;
+
import java.lang.annotation.Annotation;
@Entity
+@Table(name="JDBC_AttachE")
public class AttachE
implements Serializable {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/PObject.java Thu Oct 22 17:12:01 2009
@@ -22,6 +22,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Table;
/**
* A persistent entity to verify IDENTITY strategy for primary key value
@@ -31,6 +32,7 @@
*
*/
@Entity
+@Table(name="ORCL_POBJECT")
public class PObject {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java Thu Oct 22 17:12:01 2009
@@ -28,6 +28,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Table;
import javax.persistence.Version;
import org.apache.openjpa.persistence.FetchAttribute;
@@ -42,6 +43,7 @@
@FetchAttribute(name = "attachEArray", recursionDepth = 0)
})
})
+@Table(name="K_AttachA")
public class AttachA implements Serializable {
@Id
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java?rev=828786&r1=828785&r2=828786&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java Thu Oct 22 17:12:01 2009
@@ -31,6 +31,7 @@
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
+import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -46,6 +47,7 @@
@FetchAttribute(name = "f")
})
})
+@Table(name="K_AttachE")
public class AttachE implements Serializable {
@Id