diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java index ac0cb8e6db..caab23855c 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java @@ -265,13 +265,13 @@ public void insertIncomingBatch(ISqlTransaction transaction, IncomingBatch batch batch.getIgnoreCount(), batch.getIgnoreRowCount(), batch.getMissingDeleteCount(), batch.getSkipCount(), batch.getSqlState(), batch.getSqlCode(), FormatUtils.abbreviateForLogging(batch.getSqlMessage()), - batch.getLastUpdatedHostName(), batch.getLastUpdatedTime(), batch.getSummary() }, + batch.getLastUpdatedHostName(), batch.getSummary() }, new int[] { Types.NUMERIC, Types.VARCHAR, Types.VARCHAR, Types.CHAR, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.NUMERIC, Types.VARCHAR, Types.NUMERIC, Types.VARCHAR, - Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR }); + Types.VARCHAR, Types.VARCHAR }); } } } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceSqlMap.java index 95cc5c77b9..7993913df0 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceSqlMap.java @@ -61,8 +61,8 @@ public IncomingBatchServiceSqlMap(IDatabasePlatform platform, Map getNodeThroughputByChannel() { String sql = getSql(sqlName); NodeThroughputMapper mapper = new NodeThroughputMapper(isAverageDateSupported); - List temp = sqlTemplateDirty.query(sql, mapper); + sqlTemplateDirty.query(sql, mapper); return mapper.getThroughputMap(); } 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 50a8d8c18c..2d2ee62557 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 @@ -41,7 +41,7 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, putSql("selectCountBatchesPrefixSql", "select count(*) from $(outgoing_batch) "); putSql("cancelLoadBatchesSql", - "update $(outgoing_batch) set ignore_count=1, status='OK', error_flag=0 where load_id=?"); + "update $(outgoing_batch) set ignore_count=1, status='OK', error_flag=0, last_update_time=current_timestamp where load_id=?"); putSql("cancelChannelBatchesSql", "update $(outgoing_batch) set ignore_count=1, status='OK', error_flag=0 where channel_id=? and status != 'OK'"); @@ -61,7 +61,7 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, + " ignore_count=?, router_millis=?, network_millis=?, filter_millis=?, " + " load_millis=?, extract_millis=?, extract_start_time=?, transfer_start_time=?, load_start_time=?, " + " sql_state=?, sql_code=?, sql_message=?, " - + " failed_data_id=?, last_update_hostname=?, last_update_time=?, summary=? where batch_id=? and node_id=? "); + + " failed_data_id=?, last_update_hostname=?, last_update_time=current_timestamp, summary=? where batch_id=? and node_id=? "); putSql("findOutgoingBatchSql", "where batch_id=? and node_id=? ");