You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2016/11/06 21:13:07 UTC
svn commit: r1768389 - in /openjpa/branches/2.4.x: ./
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/com...
Author: struberg
Date: Sun Nov 6 21:13:06 2016
New Revision: 1768389
URL: http://svn.apache.org/viewvc?rev=1768389&view=rev
Log:
explicit table names for all the Entity1
This seems to cause timing issues with derby on Linux.
Ported over -r 1757650 from trunk.
Modified:
openjpa/branches/2.4.x/ (props changed)
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java
Propchange: openjpa/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 6 21:13:06 2016
@@ -4,4 +4,4 @@
/openjpa/branches/2.2.1.x:1415367,1415413,1415425,1504719,1508186,1530347,1533222,1539193,1651808,1686910
/openjpa/branches/2.2.x:1384400,1415459-1415460,1415469,1485013,1530364,1533223,1580898,1580939,1591681,1631786,1641906,1642555,1666312,1686911,1700884,1702143,1728038,1756046,1756538
/openjpa/branches/2.3.x:1533462,1535560,1536912,1540277,1564121
-/openjpa/trunk:1757057,1757131,1768191,1768216
+/openjpa/trunk:1757057,1757131,1757650,1768191,1768216
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java Sun Nov 6 21:13:06 2016
@@ -36,7 +36,7 @@ import javax.persistence.Version;
@Entity
-@Table(name="entity_1")
+@Table(name="annotypeentity_1")
@Inheritance(strategy=InheritanceType.JOINED)
@SqlResultSetMapping(name="NativeTestResult",
entities=@EntityResult(entityClass=Entity1.class))
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java Sun Nov 6 21:13:06 2016
@@ -35,7 +35,7 @@ import javax.persistence.Version;
@Entity
-@Table(name="entity_1")
+@Table(name="ddtypeentity_1")
@Inheritance(strategy=InheritanceType.JOINED)
@SqlResultSetMapping(name="NativeTestResult",
entities=@EntityResult(entityClass=Entity1.class))
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java Sun Nov 6 21:13:06 2016
@@ -35,7 +35,7 @@ import javax.persistence.Version;
@Entity
-@Table(name="entity_1")
+@Table(name="pcaentity_1")
@Inheritance(strategy=InheritanceType.JOINED)
@SqlResultSetMapping(name="NativeTestResult",
entities=@EntityResult(entityClass=Entity1.class))
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity1.java Sun Nov 6 21:13:06 2016
@@ -22,8 +22,10 @@ import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToOne;
+import javax.persistence.Table;
@Entity
+@Table(name="detachentity_1")
public class Entity1 {
@Id
private long id;
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java Sun Nov 6 21:13:06 2016
@@ -33,7 +33,7 @@ import javax.persistence.Table;
import javax.persistence.Version;
@Entity
-@Table(name = "entity_1")
+@Table(name = "enhanceentity_1")
@Inheritance(strategy = InheritanceType.JOINED)
@SqlResultSetMapping(name = "NativeTestResult",
entities = @EntityResult(entityClass = Entity1.class))
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java Sun Nov 6 21:13:06 2016
@@ -37,11 +37,11 @@ import javax.persistence.Version;
@Entity
-@Table(name="entity_1")
+@Table(name="mapappentity_1")
@Inheritance(strategy=InheritanceType.JOINED)
@SqlResultSetMapping(name="NativeTestResult",
entities=@EntityResult(entityClass=Entity1.class))
-@NamedNativeQuery(name="SQLWithHints", query="SELECT * FROM ENTITY_1",
+@NamedNativeQuery(name="SQLWithHints", query="SELECT * FROM mapappentity_1",
hints={@QueryHint(name="XYZ", value="abc")})
public class Entity1 implements Serializable
{
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java Sun Nov 6 21:13:06 2016
@@ -33,7 +33,7 @@ import javax.persistence.Table;
import javax.persistence.Version;
@Entity
-@Table(name = "entity_1")
+@Table(name = "kernentity_1")
@Inheritance(strategy = InheritanceType.JOINED)
@SqlResultSetMapping(name = "NativeTestResult", entities = @EntityResult(
entityClass =
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java Sun Nov 6 21:13:06 2016
@@ -34,7 +34,7 @@ import javax.persistence.Table;
import javax.persistence.Version;
@Entity
-@Table(name = "entity_1")
+@Table(name = "qryentity_1")
@Inheritance(strategy = InheritanceType.JOINED)
@SqlResultSetMapping(name = "NativeTestResult",
entities = @EntityResult(entityClass = Entity1.class))
Modified: openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java?rev=1768389&r1=1768388&r2=1768389&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java Sun Nov 6 21:13:06 2016
@@ -29,9 +29,11 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.OneToOne;
import javax.persistence.SqlResultSetMapping;
+import javax.persistence.Table;
import javax.persistence.Version;
@Entity
+@Table(name="qcacheentity_1")
@Inheritance(strategy = InheritanceType.JOINED)
@SqlResultSetMapping(name = "NativeTestResult",
entities = @EntityResult(entityClass = Entity1.class))