[jboss-cvs] JBossAS SVN: r82851 - branches/JBPAPP_4_3_0_GA_CP02_SOA-1130/server/src/main/org/jboss/ejb/txtimer.

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

Author: mageshbk at jboss.com
Date: 2009-01-14 01:52:18 -0500 (Wed, 14 Jan 2009)
New Revision: 82851

Modified:
   branches/JBPAPP_4_3_0_GA_CP02_SOA-1130/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java
Log:
SOA-1130 - Merged fix for [JBPAPP-1366 - EJB TIMERS Table Creation Fails When Oracle Schema Specified]

Modified: branches/JBPAPP_4_3_0_GA_CP02_SOA-1130/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP02_SOA-1130/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java	2009-01-14 06:22:05 UTC (rev 82850)
+++ branches/JBPAPP_4_3_0_GA_CP02_SOA-1130/server/src/main/org/jboss/ejb/txtimer/GeneralPurposeDatabasePersistencePlugin.java	2009-01-14 06:52:18 UTC (rev 82851)
@@ -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);