From 3f28e4e83b1cec8f9f59f62e6e752d25244256d4 Mon Sep 17 00:00:00 2001 From: mmichalek Date: Tue, 31 Oct 2017 10:29:17 -0400 Subject: [PATCH 1/2] 0003296: Routing should use a dirtySqlTemplate for getReadyChannels() --- .../java/org/jumpmind/symmetric/service/impl/RouterService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index a007ac4e89..17cb6862fb 100644 --- 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 getReadyChannels() { } final Set readyChannels = new HashSet(); - sqlTemplate.query(sql, new ISqlRowMapper() { + sqlTemplateDirty.query(sql, new ISqlRowMapper() { public String mapRow(Row row) { readyChannels.add(row.getString("channel_id")); return null; From 9242c0417e3d469fd733260c8964359ab2790a2a Mon Sep 17 00:00:00 2001 From: mmichalek Date: Tue, 31 Oct 2017 10:32:04 -0400 Subject: [PATCH 2/2] 0003286: dbcompare improvements --- .../main/java/org/jumpmind/symmetric/io/DbCompareConfig.java | 3 +++ 1 file changed, 3 insertions(+) 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 index c55ddd161d..a420945de0 100644 --- 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; }