From 552291bfbd076f9795f2cf8d3560d13a94e1d74b Mon Sep 17 00:00:00 2001
From: Philip Marzullo <pmarzullo@jumpmind.com>
Date: Wed, 5 Jul 2023 15:23:33 -0400
Subject: [PATCH] 0005903: Failing to create trigger on table

---
 .../db/mssql/MsSqlTriggerTemplate.java        |  6 ------
 .../mssql2000/MsSql2000TriggerTemplate.java   | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 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
index afc0ee4efc..37829005e5 100644
--- 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
@@ -503,12 +503,6 @@ protected String replaceTemplateVariables(DataEventType dml, Trigger trigger,
     {
         ddl =  super.replaceTemplateVariables(dml, trigger, history, channel, tablePrefix, originalTable, table,
                 defaultCatalog, defaultSchema, ddl);
-        Column[] columns = table.getPrimaryKeyColumns();
-        ddl = FormatUtils.replace("declareOldKeyVariables",
-                buildKeyVariablesDeclare(columns, "old"), ddl);
-        ddl = FormatUtils.replace("declareNewKeyVariables",
-                buildKeyVariablesDeclare(columns, "new"), ddl);
-        
         ddl = FormatUtils.replace("anyNonBlobColumnChanged",
                 buildNonLobColumnsAreNotEqualString(table, newTriggerValue, oldTriggerValue), ddl);
         
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql2000/MsSql2000TriggerTemplate.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql2000/MsSql2000TriggerTemplate.java
index f971efe01f..da314b0f37 100644
--- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql2000/MsSql2000TriggerTemplate.java
+++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql2000/MsSql2000TriggerTemplate.java
@@ -22,8 +22,15 @@
 
 import java.util.HashMap;
 
+import org.jumpmind.db.model.Column;
+import org.jumpmind.db.model.Table;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
 import org.jumpmind.symmetric.db.mssql.MsSqlTriggerTemplate;
+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 MsSql2000TriggerTemplate extends MsSqlTriggerTemplate {
     public MsSql2000TriggerTemplate(ISymmetricDialect symmetricDialect) {
@@ -203,4 +210,18 @@ public MsSql2000TriggerTemplate(ISymmetricDialect symmetricDialect) {
 
     }
 
+    @Override
+    protected String replaceTemplateVariables(DataEventType dml, Trigger trigger,
+            TriggerHistory history, Channel channel, String tablePrefix, Table originalTable, Table table,
+            String defaultCatalog, String defaultSchema, String ddl)
+    {
+        ddl =  super.replaceTemplateVariables(dml, trigger, history, channel, tablePrefix, originalTable, 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;
+    }
 }