From a7a354a325ebd9a09f6c41516fe0fd634828010f Mon Sep 17 00:00:00 2001 From: Chris Henson Date: Tue, 2 May 2017 17:01:23 -0400 Subject: [PATCH] 0003087: When a trigger_hist row can't be found use the catalog and schema from the trigger definition to look up the table to "recreate" --- .../jumpmind/symmetric/service/impl/DataService.java | 10 +++------- 1 file changed, 3 insertions(+), 7 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 index 76283c44ba..42b2176c84 100644 --- 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 @@ -1379,11 +1379,6 @@ public String reloadNode(String nodeId, boolean reverseLoad, String createBy) { return String.format("Could not enable initial load for %s", nodeId); } } - - private void insertNodeSecurityUpdate(ISqlTransaction transaction, String nodeIdRecord, - String targetNodeId, boolean isLoad, long loadId, String createBy) { - insertNodeSecurityUpdate(transaction, nodeIdRecord, targetNodeId, isLoad, loadId, createBy, null); - } private void insertNodeSecurityUpdate(ISqlTransaction transaction, String nodeIdRecord, String targetNodeId, boolean isLoad, long loadId, String createBy, String channelId) { @@ -2106,7 +2101,7 @@ public void deleteCapturedConfigChannelData() { public Map getLastDataCaptureByChannel() { Map captureMap = new HashMap(); LastCaptureByChannelMapper mapper = new LastCaptureByChannelMapper(captureMap); - List temp = sqlTemplate.query(getSql("findLastCaptureTimeByChannelSql"), mapper); + sqlTemplate.query(getSql("findLastCaptureTimeByChannelSql"), mapper); return mapper.getCaptureMap(); } @@ -2217,12 +2212,13 @@ public Data mapRow(Row row) { TriggerHistory triggerHistory = engine.getTriggerRouterService().getTriggerHistory( triggerHistId); if (triggerHistory == null) { - Table table = platform.getTableFromCache(null, null, tableName, true); Trigger trigger = null; + Table table = null; List triggerRouters = engine.getTriggerRouterService().getAllTriggerRoutersForCurrentNode(engine.getNodeService().findIdentity().getNodeGroupId()); for (TriggerRouter triggerRouter : triggerRouters) { if (triggerRouter.getTrigger().getSourceTableName().equalsIgnoreCase(tableName)) { trigger = triggerRouter.getTrigger(); + table = platform.getTableFromCache(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(), tableName, false); break; } }