svn commit: r1073089 - in /openjpa/branches/2.1.x: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java

[mi...@apache.org]

Author: mikedd
Date: Mon Feb 21 17:46:49 2011
New Revision: 1073089

URL: http://svn.apache.org/viewvc?rev=1073089&view=rev
Log:
OPENJPA-1939: Increase index length for DB2 and testcase workaround for OPENJPA-1948

Modified:
    openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
    openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java

Modified: openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=1073089&r1=1073088&r2=1073089&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
+++ openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Mon Feb 21 17:46:49 2011
@@ -118,7 +118,7 @@ public class DB2Dictionary
         }));
         systemSchemas = "SYSCAT,SYSIBM,SYSSTAT,SYSIBMADM,SYSTOOLS";
         maxConstraintNameLength = 18;
-        maxIndexNameLength = 18;
+        maxIndexNameLength = 128;
         maxColumnNameLength = 30;
         supportsDeferredConstraints = false;
         supportsDefaultDeleteAction = false;

Modified: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java?rev=1073089&r1=1073088&r2=1073089&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java (original)
+++ openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java Mon Feb 21 17:46:49 2011
@@ -36,21 +36,21 @@ import javax.persistence.SecondaryTable;
 import javax.persistence.Table;
 
 @Entity
-@Table(name="entity h", schema="delim id2")
-@SecondaryTable(name="h sec join table", schema="delim id2",
-    pkJoinColumns=@PrimaryKeyJoinColumn(name="entity h",
-        referencedColumnName="h id"))
+@Table(name="entity ha", schema="delim id2")
+@SecondaryTable(name="ha sec join table", schema="delim id2",
+    pkJoinColumns=@PrimaryKeyJoinColumn(name="entity ha",
+        referencedColumnName="ha id"))
 public class EntityH {
     @Id
-    @Column(name="h id")
+    @Column(name="ha id")
     private int id;
     private String name;
     
-    @Column(table="h sec join table")
+    @Column(table="ha sec join table")
     private String secName;
     
     @ManyToMany
-    @JoinTable(name="h i", schema="delim id2")
+    @JoinTable(name="ha i", schema="delim id2")
     private Collection<EntityI> entityIs = new HashSet<EntityI>();
     
     @OneToOne
@@ -58,7 +58,7 @@ public class EntityH {
     private EntityI2 entityI2;
     
     @ManyToMany
-    @JoinTable(name="map3 join table", schema="delim id2")
+    @JoinTable(name="map3a join table", schema="delim id2")
     @MapKeyJoinColumn(name="map_ei3", referencedColumnName="entityI3 id")
     Map<EntityI3,EntityI4> map = new HashMap<EntityI3,EntityI4>();