From b44614d94b13f90d879aff00d0c8bd62f368529f Mon Sep 17 00:00:00 2001
From: Michael Dick <mikedd@apache.org>
Date: Mon, 21 Feb 2011 16:06:05 +0000
Subject: [PATCH] OPENJPA-1939: Increase index length for DB2 and testcase
 workaround for OPENJPA-1948

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1073042 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/openjpa/jdbc/sql/DB2Dictionary.java   |  3 +--
 .../delimited/identifiers/EntityH.java           | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
index 26dba9bf7..85a326a85 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
@@ -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;
@@ -345,7 +345,6 @@ public class DB2Dictionary
             forUpdateClause = "WITH RR USE AND KEEP UPDATE LOCKS";
             
             if (maj >=9) { 
-                maxIndexNameLength=128;
                 supportsXMLColumn = true;
             }
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java
index 9ba07edf0..7fa6c5c05 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java
@@ -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>();