You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2010/10/05 19:02:32 UTC
svn commit: r1004714 - in
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa:
./ model/
Author: mikedd
Date: Tue Oct 5 17:02:32 2010
New Revision: 1004714
URL: http://svn.apache.org/viewvc?rev=1004714&view=rev
Log:
Make column names consistent for cache tests.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java?rev=1004714&r1=1004713&r2=1004714&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java Tue Oct 5 17:02:32 2010
@@ -323,11 +323,11 @@ public abstract class AbstractCacheModeT
em = getEntityManagerFactory().createEntityManager();
em.setProperty(RETRIEVE_MODE_PROP, CacheRetrieveMode.BYPASS);
CacheableEntity ceFromDB =
- (CacheableEntity) em.createNativeQuery("Select * from CacheableEntity where id = 1", CacheableEntity.class)
+ (CacheableEntity) em.createNativeQuery("Select * from CacheableEntity where ID = 1", CacheableEntity.class)
.getSingleResult();
XmlCacheableEntity xceFromDB =
- (XmlCacheableEntity) em.createNativeQuery("Select * from XmlCacheableEntity where id = 1",
+ (XmlCacheableEntity) em.createNativeQuery("Select * from XmlCacheableEntity where ID = 1",
XmlCacheableEntity.class).getSingleResult();
assertEquals(version + 1, ceFromDB.getVersion());
@@ -360,8 +360,8 @@ public abstract class AbstractCacheModeT
int e1Version = e1.getVersion();
int e2Version = e2.getVersion();
- String e1Sql = "UPDATE CacheableEntity SET VERSION=?1 WHERE ID=?2";
- String e2Sql = "UPDATE XmlCacheableEntity SET VERSION=?1 WHERE ID=?2";
+ String e1Sql = "UPDATE CacheableEntity SET VERSN=?1 WHERE ID=?2";
+ String e2Sql = "UPDATE XmlCacheableEntity SET VERSN=?1 WHERE ID=?2";
em.getTransaction().begin();
assertEquals(1, em.createNativeQuery(e1Sql).setParameter(1, e1Version + 1).setParameter(2, e1.getId())
.executeUpdate());
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java?rev=1004714&r1=1004713&r2=1004714&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java Tue Oct 5 17:02:32 2010
@@ -19,6 +19,7 @@
package org.apache.openjpa.persistence.cache.jpa.model;
import javax.persistence.Cacheable;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Version;
@@ -27,9 +28,11 @@ import javax.persistence.Version;
@Cacheable(true)
public class CacheableEntity implements CacheEntity {
@Id
+ @Column(name="ID")
private int id;
@Version
+ @Column(name="VERSN")
private int version;
private String name;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java?rev=1004714&r1=1004713&r2=1004714&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java Tue Oct 5 17:02:32 2010
@@ -18,6 +18,7 @@
*/
package org.apache.openjpa.persistence.cache.jpa.model;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Version;
@@ -29,9 +30,11 @@ import javax.persistence.Version;
@Entity
public class NegatedCachableEntity implements CacheEntity {
@Id
+ @Column(name="ID")
private int id;
@Version
+ @Column(name="VERSN")
private int version;
private String name;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java?rev=1004714&r1=1004713&r2=1004714&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java Tue Oct 5 17:02:32 2010
@@ -18,6 +18,7 @@
*/
package org.apache.openjpa.persistence.cache.jpa.model;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Version;
@@ -29,9 +30,11 @@ import javax.persistence.Version;
@Entity
public class NegatedUncacheableEntity implements CacheEntity {
@Id
+ @Column(name="ID")
private int id;
@Version
+ @Column(name="VERSN")
private int version;
private String name;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java?rev=1004714&r1=1004713&r2=1004714&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java Tue Oct 5 17:02:32 2010
@@ -19,6 +19,7 @@
package org.apache.openjpa.persistence.cache.jpa.model;
import javax.persistence.Cacheable;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Version;
@@ -27,9 +28,11 @@ import javax.persistence.Version;
@Cacheable(false)
public class UncacheableEntity implements CacheEntity {
@Id
+ @Column(name="ID")
private int id;
@Version
+ @Column(name="VERSN")
private int version;
private String name;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java?rev=1004714&r1=1004713&r2=1004714&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java Tue Oct 5 17:02:32 2010
@@ -18,6 +18,7 @@
*/
package org.apache.openjpa.persistence.cache.jpa.model;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Version;
@@ -25,9 +26,11 @@ import javax.persistence.Version;
@Entity
public class UnspecifiedEntity implements CacheEntity {
@Id
+ @Column(name="ID")
private int id;
@Version
+ @Column(name="VERSN")
private int version;
private String name;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java?rev=1004714&r1=1004713&r2=1004714&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java Tue Oct 5 17:02:32 2010
@@ -18,6 +18,7 @@
*/
package org.apache.openjpa.persistence.cache.jpa.model;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Version;
@@ -28,9 +29,11 @@ import javax.persistence.Version;
@Entity
public class XmlCacheableEntity implements CacheEntity {
@Id
+ @Column(name="ID")
private int id;
@Version
+ @Column(name="VERSN")
private int version;
private String name;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java?rev=1004714&r1=1004713&r2=1004714&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java Tue Oct 5 17:02:32 2010
@@ -18,6 +18,7 @@
*/
package org.apache.openjpa.persistence.cache.jpa.model;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Version;
@@ -28,9 +29,11 @@ import javax.persistence.Version;
@Entity
public class XmlUncacheableEntity implements CacheEntity {
@Id
+ @Column(name="ID")
private int id;
@Version
+ @Column(name="VERSN")
private int version;
private String name;