0002898: DBCompare should consult sym_router when determining target

catalog and schema
JumpMind · Nov 16, 2016 · 474d0b5 · 474d0b5
1 parent 941e90b
commit 474d0b5
Showing 1 changed file with 28 additions and 1 deletion.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java
@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -43,6 +44,7 @@
 import org.jumpmind.symmetric.common.TableConstants;
 import org.jumpmind.symmetric.io.DbCompareReport.TableReport;
 import org.jumpmind.symmetric.model.Trigger;
+import org.jumpmind.symmetric.model.TriggerRouter;
 import org.jumpmind.symmetric.service.impl.TransformService.TransformTableNodeGroupLink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -393,6 +395,10 @@ protected boolean mapPrimaryKey(DbCompareTables tables) {
 
     protected Table loadTargetTable(DbCompareTables tables) {
         Table targetTable = null;
+
+        String catalog = targetEngine.getDatabasePlatform().getDefaultCatalog();
+        String schema = targetEngine.getDatabasePlatform().getDefaultSchema();
+
         if (config.isUseSymmetricConfig()) {
             TransformTableNodeGroupLink transform = getTransformFor(tables.getSourceTable());
             if (transform != null) {
@@ -401,15 +407,36 @@ protected Table loadTargetTable(DbCompareTables tables) {
                 tables.setTransform(transform);
                 return targetTable;
             }
+
+            TriggerRouter triggerRouter = getTriggerRouterFor(tables.getSourceTable());
+            if (triggerRouter != null) {
+                catalog = triggerRouter.getTargetCatalog(catalog);
+                schema = triggerRouter.getTargetSchema(schema);
+            }
         } 
 
         targetTable = targetEngine.getDatabasePlatform().
-                getTableFromCache(tables.getSourceTable().getName(), true);
+                getTableFromCache(catalog, schema, tables.getSourceTable().getName(), true);
         tables.setTargetTable(targetTable);
 
         return targetTable;
     }
 
+    protected TriggerRouter getTriggerRouterFor(Table sourceTable) {
+        // TODO get routers.
+        Set<TriggerRouter> triggerRouters = sourceEngine.getTriggerRouterService().getTriggerRouterForTableForCurrentNode(
+                sourceTable.getCatalog(), sourceTable.getSchema(), sourceTable.getName(), false);
+
+        for (TriggerRouter triggerRouter : triggerRouters) {
+            String routerTargetNodeGroupId = triggerRouter.getRouter().getNodeGroupLink().getTargetNodeGroupId();
+            String compareTargetNodeGroupId = targetEngine.getNodeService().getCachedIdentity().getNodeGroupId();
+            if (StringUtils.equals(compareTargetNodeGroupId, routerTargetNodeGroupId)) {
+                return triggerRouter;
+            }
+        }
+        return null;
+    }
+
     protected TransformTableNodeGroupLink getTransformFor(Table sourceTable) {
         String sourceNodeGroupId = sourceEngine.getNodeService().findIdentity().getNodeGroupId(); 
         String targetNodeGroupId = targetEngine.getNodeService().findIdentity().getNodeGroupId();