Merge pull request #604 from davidweaver/PAYARA-560

Payara 560 Not all Batch objects use Prefix/suffix
payara · Jan 15, 2016 · c12765f · c12765f
2 parents c298e59 + 10127ea
commit c12765f
Show file tree

Hide file tree

Showing 2 changed files with 132 additions and 65 deletions.
diff --git a/...tch-connector/src/main/java/fish/payara/jbatch/persistence/rdbms/OracleJDBCConstants.java b/...tch-connector/src/main/java/fish/payara/jbatch/persistence/rdbms/OracleJDBCConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 C2B2 Consulting Limited. All rights reserved.
+ * Copyright (c) 2014, 2016 C2B2 Consulting Limited. All rights reserved.
  
  * The contents of this file are subject to the terms of the Common Development
  * and Distribution License("CDDL") (collectively, the "License").  You
@@ -28,25 +28,28 @@ public interface OracleJDBCConstants {
 		public static final String CREATE_TABLE_CHECKPOINTDATA = "CREATE_TABLE_CHECKPOINTDATA";
 		public static final String CREATE_TABLE_JOBINSTANCEDATA = "CREATE_TABLE_JOBINSTANCEDATA";
 		public static final String CREATE_JOBINSTANCEDATA_SEQ = "CREATE_JOBINSTANCEDATA_SEQ";
-		public static final String JOBINSTANCEDATA_SEQ_KEY = "JOBINSTANCEDATA_SEQ";
+		public static final String JOBINSTANCEDATA_SEQ_KEY = "JOBINSTANCE_SEQ";
 		public static final String CREATE_JOBINSTANCEDATA_TRG = "CREATE_JOBINSTANCEDATA_TRG";
-		public static final String JOBINSTANCEDATA_TRG_KEY = "JOBINSTANCEDATA_TRG";
+		public static final String JOBINSTANCEDATA_TRG_KEY = "JOBINSTANCE_TRG";
 
 
 		public static final String CREATE_TABLE_EXECUTIONINSTANCEDATA = "CREATE_TABLE_EXECUTIONINSTANCEDATA";
 		public static final String CREATE_EXECUTIONINSTANCEDATA_SEQ = "CREATE_EXECUTIONINSTANCEDATA_SEQ";
-		public static final String EXECUTIONINSTANCEDATA_SEQ_KEY = "EXECUTIONINSTANCEDATA_SEQ";
+		public static final String EXECUTIONINSTANCEDATA_SEQ_KEY = "EXECUTIONINSTANCE_SEQ";
 		public static final String CREATE_EXECUTIONINSTANCEDATA_TRG = "CREATE_EXECUTIONINSTANCEDATA_TRG";
-		public static final String EXECUTIONINSTANCEDATA_TRG_KEY = "EXECUTIONINSTANCEDATA_TRG";
+		public static final String EXECUTIONINSTANCEDATA_TRG_KEY = "EXECUTIONINSTANCE_TRG";
 
 		public static final String CREATE_TABLE_STEPINSTANCEDATA = "CREATE_TABLE_STEPINSTANCEDATA";
 		public static final String CREATE_STEPINSTANCEDATA_SEQ = "CREATE_STEPINSTANCEDATA_SEQ";
-		public static final String STEPINSTANCEDATA_SEQ_KEY = "STEPEXECUTIONINSTANCEDATA_SEQ";
+		public static final String STEPINSTANCEDATA_SEQ_KEY = "STEPEXECUTIONINSTANCE_SEQ";
 		public static final String CREATE_STEPINSTANCEDATA_TRG = "CREATE_STEPINSTANCEDATA_TRG";
-		public static final String STEPINSTANCEDATA_TRG_KEY = "STEPEXECUTIONINSTANCEDATA_TRG";
+		public static final String STEPINSTANCEDATA_TRG_KEY = "STEPEXECUTIONINSTANCE_TRG";
 
 		public static final String CREATE_CHECKPOINTDATA_INDEX = "CREATE_CHECKPOINTDATA_INDEX";
-		public static final String CREATE_CHECKPOINTDATA_INDEX_KEY = "chk_index";	
-
-
+		public static final String CREATE_CHECKPOINTDATA_INDEX_KEY = "chk_index";
+
+                // Previous default trigger names for backward compatibility
+                public static final String DEFAULT_JOBINSTANCEDATA_TRG_KEY = "JOBINSTANCEDATA_TRG";
+                public static final String DEFAULT_EXECUTIONINSTANCEDATA_TRG_KEY = "EXECUTIONINSTANCEDATA_TRG";
+                public static final String DEFAULT_STEPINSTANCEDATA_TRG_KEY = "STEPEXECUTIONINSTANCEDATA_TRG";
 }