0002030: For initial load deletes, provide BOTH source and target nod…

…e replacement variables
JumpMind · Oct 28, 2014 · 29fe3d2 · 29fe3d2
1 parent c8be306
commit 29fe3d2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -687,11 +687,18 @@ private TriggerHistory lookupTriggerHistory(Trigger trigger) {
     protected void insertPurgeEvent(ISqlTransaction transaction, Node targetNode,
             TriggerRouter triggerRouter, TriggerHistory triggerHistory, boolean isLoad,
             String overrideDeleteStatement, long loadId, String createBy) {
+        Node sourceNode = engine.getNodeService().findIdentity();
         String sql = StringUtils.isNotBlank(overrideDeleteStatement) ? overrideDeleteStatement
                 : symmetricDialect.createPurgeSqlFor(targetNode, triggerRouter, triggerHistory);
         sql = FormatUtils.replace("groupId", targetNode.getNodeGroupId(), sql);
         sql = FormatUtils.replace("externalId", targetNode.getExternalId(), sql);
         sql = FormatUtils.replace("nodeId", targetNode.getNodeId(), sql);
+        sql = FormatUtils.replace("targetGroupId", targetNode.getNodeGroupId(), sql);
+        sql = FormatUtils.replace("targetExternalId", targetNode.getExternalId(), sql);
+        sql = FormatUtils.replace("targetNodeId", targetNode.getNodeId(), sql);
+        sql = FormatUtils.replace("sourceGroupId", sourceNode.getNodeGroupId(), sql);
+        sql = FormatUtils.replace("sourceExternalId", sourceNode.getExternalId(), sql);
+        sql = FormatUtils.replace("sourceNodeId", sourceNode.getNodeId(), sql);
         String channelId = getReloadChannelIdForTrigger(triggerRouter.getTrigger(), engine
                 .getConfigurationService().getChannels(false));
         Data data = new Data(triggerHistory.getSourceTableName(), DataEventType.SQL,