SYMMETRICDS-442

JumpMind · May 18, 2011 · 1719b51 · 1719b51
1 parent da2150a
commit 1719b51
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/SqlTemplate.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/SqlTemplate.java
@@ -211,8 +211,7 @@ public String replaceTemplateVariables(IDbDialect dialect, DataEventType dml, Tr
 
         ddl = AppUtils.replace("targetTableName", getDefaultTargetTableName(trigger, history), ddl);
 
-        ddl = AppUtils.replace("triggerName", history.getTriggerNameForDmlType(dml), ddl);
-        ddl = AppUtils.replace("prefixName", tablePrefix, ddl);
+        ddl = AppUtils.replace("triggerName", history.getTriggerNameForDmlType(dml), ddl);        
         ddl = AppUtils.replace("channelName", trigger.getChannelId(), ddl);
         ddl = AppUtils.replace("triggerHistoryId", Integer.toString(history == null ? -1 : history.getTriggerHistoryId()), ddl);
         String triggerExpression = dialect.getTransactionTriggerExpression(defaultCatalog, defaultSchema, trigger);
@@ -279,7 +278,9 @@ public String replaceTemplateVariables(IDbDialect dialect, DataEventType dml, Tr
         ddl = AppUtils.replace("newTriggerValue", newTriggerValue, ddl);
         ddl = AppUtils.replace("oldTriggerValue", oldTriggerValue, ddl);
         ddl = AppUtils.replace("newColumnPrefix", newColumnPrefix, ddl);
-        ddl = AppUtils.replace("oldColumnPrefix", oldColumnPrefix, ddl);
+        ddl = AppUtils.replace("oldColumnPrefix", oldColumnPrefix, ddl);
+        ddl = AppUtils.replace("prefixName", tablePrefix, ddl);
+
         switch (dml) {
         case DELETE:
             ddl = AppUtils.replace("curTriggerValue", oldTriggerValue, ddl);