Merge branch '3.10' of https://github.com/JumpMind/symmetric-ds.git i…

…nto 3.10
JumpMind · Jun 19, 2019 · 74ae919 · 74ae919
2 parents 6832351 + 45fe6c7
commit 74ae919
Show file tree

Hide file tree

Showing 2 changed files with 7 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
@@ -365,7 +365,11 @@ protected List<DbCompareTables> loadTables(List<String> tableNames, List <String
                 sourceTable = sourceEngine.getDatabasePlatform().getTableFromCache(tableName, true);
             } else {
                 sourceTable = sourceEngine.getDatabasePlatform().
-                        getTableFromCache(tableNameParts.get("catalog"), tableNameParts.get("schema"), tableNameParts.get("table"), true);
+                        getTableFromCache(tableNameParts.get("catalog"), tableNameParts.get("schema"), tableNameParts.get("table"), true);                
+                if (sourceTable == null) {                    
+                    sourceTable = sourceEngine.getDatabasePlatform().
+                            getTableFromCache(tableNameParts.get("schema"), tableNameParts.get("catalog"), tableNameParts.get("table"), true);
+                }
             }
 
             if (sourceTable == null) {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompareConfig.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompareConfig.java
@@ -50,6 +50,7 @@ public class DbCompareConfig {
     private Map<String, String> configSources = new HashMap<String, String>();
 
     public DbCompareConfig() {
+        configSources.put("sourceTableNames", "default");
         configSources.put("includedTableNames", "default");
         configSources.put("targetTableNames", "default");
         configSources.put("excludedTableNames", "default");
@@ -58,6 +59,7 @@ public DbCompareConfig() {
         configSources.put("whereClauses", "default");
         configSources.put("tablesToExcludedColumns", "default");
         configSources.put("sqlDiffFileName", "default");
+        configSources.put("outputSql", "default");
     }
 
     public String getSourceWhereClause(String tableName) {