0003639: Initial load fails on delete first when router uses the "Use

Source Catalog/Schema" setting
JumpMind · Jul 20, 2018 · 3488239 · 3488239
1 parent 590f0c7
commit 3488239
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
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
@@ -437,8 +437,8 @@ protected Table loadTargetTable(DbCompareTables tables, String targetTableNameOv
 
             TriggerRouter triggerRouter = getTriggerRouterFor(tables.getSourceTable());
             if (triggerRouter != null) {
-                catalog = triggerRouter.getTargetCatalog(catalog);
-                schema = triggerRouter.getTargetSchema(schema);
+                catalog = triggerRouter.getTargetCatalog(catalog, null);
+                schema = triggerRouter.getTargetSchema(schema, null);
             }
         } 
 

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TriggerRouter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TriggerRouter.java
@@ -157,17 +157,21 @@ public boolean isRouted(DataEventType event) {
         }
     }
 
-    public String getTargetSchema(String defaultSchema) {
+    public String getTargetSchema(String defaultSchema, TriggerHistory triggerHistory) {
         if (router != null && !StringUtils.isBlank(router.getTargetSchemaName())) {
             return router.getTargetSchemaName();
+        } else if (router != null && router.isUseSourceCatalogSchema() && triggerHistory != null) {
+            return triggerHistory.getSourceSchemaName(); 
         } else {
             return defaultSchema;
         }
     }
 
-    public String getTargetCatalog(String defaultCatalog) {
+    public String getTargetCatalog(String defaultCatalog, TriggerHistory triggerHistory) {
         if (router != null && !StringUtils.isBlank(router.getTargetCatalogName())) {
             return router.getTargetCatalogName();
+        } else if (router != null && router.isUseSourceCatalogSchema() && triggerHistory != null) {
+            return triggerHistory.getSourceCatalogName(); 
         } else {
             return defaultCatalog;
         }
@@ -188,8 +192,8 @@ public String getTargetTable(TriggerHistory triggerHistory) {
     }   
 
     public String qualifiedTargetTableName(TriggerHistory triggerHistory) {
-        String catalog = getTargetCatalog(null);
-        String schema = getTargetSchema(null);
+        String catalog = getTargetCatalog(null, triggerHistory);
+        String schema = getTargetSchema(null, triggerHistory);
         String tableName = getTargetTable(triggerHistory);
         if (!StringUtils.isBlank(schema)) {
             tableName = schema + "." + tableName;