SYMMETRICDS-615 - When a timestamp with time zone column is part of a…

… primary key or part of a table w.out a primary key, then the trigger fails to create.
JumpMind · May 1, 2012 · 1f30534 · 1f30534
1 parent 2842882
commit 1f30534
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 6 deletions.
diff --git a/.../symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlTriggerTemplate.java b/.../symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlTriggerTemplate.java
@@ -2,8 +2,15 @@
 
 import java.util.HashMap;
 
+import org.jumpmind.db.model.Column;
+import org.jumpmind.db.model.Table;
 import org.jumpmind.symmetric.db.AbstractTriggerTemplate;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
+import org.jumpmind.symmetric.io.data.DataEventType;
+import org.jumpmind.symmetric.model.Channel;
+import org.jumpmind.symmetric.model.Trigger;
+import org.jumpmind.symmetric.model.TriggerHistory;
+import org.jumpmind.util.FormatUtils;
 
 public class MsSqlTriggerTemplate extends AbstractTriggerTemplate {
 
@@ -155,6 +162,19 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
 
     }
 
+    @Override
+    public String replaceTemplateVariables(DataEventType dml, Trigger trigger,
+            TriggerHistory history, Channel channel, String tablePrefix, Table table,
+            String defaultCatalog, String defaultSchema, String ddl) {
+        ddl =  super.replaceTemplateVariables(dml, trigger, history, channel, tablePrefix, table,
+                defaultCatalog, defaultSchema, ddl);
+        Column[] columns = table.getPrimaryKeyColumns();
+        ddl = FormatUtils.replace("declareOldKeyVariables",
+                buildKeyVariablesDeclare(columns, "old"), ddl);
+        ddl = FormatUtils.replace("declareNewKeyVariables",
+                buildKeyVariablesDeclare(columns, "new"), ddl);
+        return ddl;
+    }
 
     @Override
     protected boolean requiresEmptyLobTemplateForDeletes() {

diff --git a/...ymmetric-client/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseTriggerTemplate.java b/...ymmetric-client/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseTriggerTemplate.java
@@ -2,8 +2,15 @@
 
 import java.util.HashMap;
 
+import org.jumpmind.db.model.Column;
+import org.jumpmind.db.model.Table;
 import org.jumpmind.symmetric.db.AbstractTriggerTemplate;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
+import org.jumpmind.symmetric.io.data.DataEventType;
+import org.jumpmind.symmetric.model.Channel;
+import org.jumpmind.symmetric.model.Trigger;
+import org.jumpmind.symmetric.model.TriggerHistory;
+import org.jumpmind.util.FormatUtils;
 
 public class SybaseTriggerTemplate extends AbstractTriggerTemplate {
 
@@ -135,5 +142,19 @@ public SybaseTriggerTemplate(ISymmetricDialect symmetricDialect) {
         sqlTemplates.put("initialLoadSqlTemplate" ,
 "select $(columns) from $(schemaName)$(tableName) t where $(whereClause)                                                                                                                                " );
     }
+
+    @Override
+    public String replaceTemplateVariables(DataEventType dml, Trigger trigger,
+            TriggerHistory history, Channel channel, String tablePrefix, Table table,
+            String defaultCatalog, String defaultSchema, String ddl) {
+        ddl =  super.replaceTemplateVariables(dml, trigger, history, channel, tablePrefix, table,
+                defaultCatalog, defaultSchema, ddl);
+        Column[] columns = table.getPrimaryKeyColumns();
+        ddl = FormatUtils.replace("declareOldKeyVariables",
+                buildKeyVariablesDeclare(columns, "old"), ddl);
+        ddl = FormatUtils.replace("declareNewKeyVariables",
+                buildKeyVariablesDeclare(columns, "new"), ddl);
+        return ddl;
+    }
 
 }
diff --git a/...etric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java b/...etric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java
@@ -361,12 +361,7 @@ public String replaceTemplateVariables(DataEventType dml, Trigger trigger,
                 getPrimaryKeyWhereString(dml == DataEventType.DELETE ? oldTriggerValue
                         : newTriggerValue, table.hasPrimaryKey() ? table.getPrimaryKeyColumns()
                         : table.getColumns()), ddl);
-
-        ddl = FormatUtils.replace("declareOldKeyVariables",
-                buildKeyVariablesDeclare(columns, "old"), ddl);
-        ddl = FormatUtils.replace("declareNewKeyVariables",
-                buildKeyVariablesDeclare(columns, "new"), ddl);
-
+
         String builtString = buildColumnNameString(oldTriggerValue, columns);
         ddl = FormatUtils.replace("oldKeyNames", StringUtils.isNotBlank(builtString) ? ","
                 + builtString : "", ddl);