Merge branch '3.8' of https://github.com/JumpMind/symmetric-ds into 3.8

JumpMind · Oct 31, 2017 · 1af87db · 1af87db
2 parents 8d5e40d + 9242c04
commit 1af87db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
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
@@ -73,6 +73,9 @@ public String getTargetWhereClause(String tableName) {
             String simpleTableName = DbCompareUtil.getUnqualifiedTableName(tableName);
             whereClause = getWhereClause(simpleTableName, "target");
         }
+        if (StringUtils.isEmpty(whereClause)) {
+            whereClause = "1=1";
+        }        
         return whereClause;
     }
 

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java
@@ -504,7 +504,7 @@ protected Set<String> getReadyChannels() {
 
         }
         final Set<String> readyChannels = new HashSet<String>();
-        sqlTemplate.query(sql, new ISqlRowMapper<String>() {
+        sqlTemplateDirty.query(sql, new ISqlRowMapper<String>() {
             public String mapRow(Row row) {
                 readyChannels.add(row.getString("channel_id"));
                 return null;