[jboss-cvs] JBossAS SVN: r81502 - branches/Branch_4_2/server/src/main/org/jboss/ejb/txtimer.

[jboss-cvs-commits at lists.jboss.org]

Author: mmillson
Date: 2008-11-24 13:37:37 -0500 (Mon, 24 Nov 2008)
New Revision: 81502

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java
Log:
Fix EJB TIMERS table creation for Oracle schema [JBAS-6241].

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java	2008-11-24 17:40:08 UTC (rev 81501)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java	2008-11-24 18:37:37 UTC (rev 81502)
@@ -158,8 +158,10 @@
 
             // Add the primary key constraint using the pk-constraint-template
             JDBCFunctionMappingMetaData pkConstraint = typeMapping.getPkConstraintTemplate();
+            String name = SQLUtil.unquote(getTableName(), ds) + "_PK";
+            name = SQLUtil.fixConstraintName(name, ds); 
             String[] templateParams = new String[] {
-                  getTableName() + "_PK",
+                  name,
                   getColumnTimerID() + ", " + getColumnTargetID()
                   };
             pkConstraint.getFunctionSql(templateParams, createTableDDL);