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

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

Author: mmillson
Date: 2008-11-24 14:30:12 -0500 (Mon, 24 Nov 2008)
New Revision: 81507

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

Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java	2008-11-24 19:17:54 UTC (rev 81506)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java	2008-11-24 19:30:12 UTC (rev 81507)
@@ -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);