From 27fae74806121d55a08c687a54b3fc1814486dc5 Mon Sep 17 00:00:00 2001 From: elong Date: Thu, 24 Mar 2016 12:37:54 -0400 Subject: [PATCH] 0002535: Some SQL has sym_ hardcoded in table name --- .../service/impl/OutgoingBatchServiceSqlMap.java | 8 ++++---- .../symmetric/service/impl/PurgeServiceSqlMap.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceSqlMap.java index e2dd6a1bc9..157a2ac492 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceSqlMap.java @@ -110,16 +110,16 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, "select b.load_id, b.node_id, b.status, b.create_by, max(error_flag) as error_flag, count(*) as cnt, min(b.create_time) as create_time, " + " max(b.last_update_time) as last_update_time, min(b.batch_id) as current_batch_id, " + " min(b.data_event_count) as current_data_event_count " - + "from sym_outgoing_batch b inner join " - + " sym_data_event e on b.batch_id=e.batch_id inner join " - + " sym_data d on d.data_id=e.data_id " + + "from $(outgoing_batch) b inner join " + + " $(data_event) e on b.batch_id=e.batch_id inner join " + + " $(data) d on d.data_id=e.data_id " + "where b.channel_id='reload' " + "group by b.load_id, b.node_id, b.status, b.create_by " + "order by b.load_id desc "); putSql("getNextOutgoingBatchForEachNodeSql", "select min(b.batch_id) as batch_id, b.node_id, b.status, b.channel_id " - + " from sym_outgoing_batch b where status != 'OK' and status != 'RT' " + + " from $(outgoing_batch) b where status != 'OK' and status != 'RT' " + " group by b.node_id, b.status, b.channel_id"); putSql("deleteOutgoingBatchesForNodeSql", diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeServiceSqlMap.java index 46b55a4709..fc6e6bc909 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeServiceSqlMap.java @@ -32,7 +32,7 @@ public PurgeServiceSqlMap(IDatabasePlatform platform, Map replac // @formatter:off putSql("deleteExtractRequestSql", "delete from $(extract_request) where status=? and last_update_time < ? and " - + "0 = (select count(1) from sym_outgoing_batch where status != 'OK' and batch_id between $(extract_request).start_batch_id and $(extract_request).end_batch_id)"); + + "0 = (select count(1) from $(outgoing_batch) where status != 'OK' and batch_id between $(extract_request).start_batch_id and $(extract_request).end_batch_id)"); putSql("deleteRegistrationRequestSql", "delete from $(registration_request) where status in (?,?,?) and last_update_time < ?");