From 55aeebeaea714049f51877be5aced50367a05dfd Mon Sep 17 00:00:00 2001 From: klementinastojanovska Date: Fri, 28 Jul 2017 11:52:02 -0400 Subject: [PATCH 1/2] NuoDb Dialect - remove $(schemaName) references --- .../symmetric/job/JobManagerSqlMap.java | 8 +- .../symmetric/db/AbstractTriggerTemplate.java | 2 +- .../service/impl/AbstractService.java | 9 +- .../impl/AcknowledgeServiceSqlMap.java | 2 +- .../service/impl/ClusterServiceSqlMap.java | 26 +-- .../impl/ConfigurationServiceSqlMap.java | 58 +++---- .../service/impl/ContextServiceSqlMap.java | 8 +- .../impl/DataExtractorServiceSqlMap.java | 10 +- .../service/impl/DataLoaderServiceSqlMap.java | 20 +-- .../service/impl/DataServiceSqlMap.java | 60 +++---- .../service/impl/ExtensionServiceSqlMap.java | 10 +- .../service/impl/FileSyncServiceSqlMap.java | 36 ++-- .../service/impl/GroupletServiceSqlMap.java | 38 ++-- .../impl/IncomingBatchServiceSqlMap.java | 28 +-- .../service/impl/LoadFilterServiceSqlMap.java | 10 +- .../impl/NodeCommunicationServiceSqlMap.java | 18 +- .../service/impl/NodeServiceSqlMap.java | 96 +++++----- .../impl/OutgoingBatchServiceSqlMap.java | 82 ++++----- .../service/impl/ParameterServiceSqlMap.java | 18 +- .../service/impl/PurgeServiceSqlMap.java | 76 ++++---- .../impl/RegistrationServiceSqlMap.java | 24 +-- .../service/impl/RouterServiceSqlMap.java | 18 +- .../service/impl/SequenceServiceSqlMap.java | 16 +- .../service/impl/StatisticServiceSqlMap.java | 16 +- .../service/impl/TransformServiceSqlMap.java | 26 +-- .../impl/TriggerRouterServiceSqlMap.java | 64 +++---- .../service/impl/UpdateServiceSqlMap.java | 4 +- .../symmetric/test/TestTablesService.java | 18 +- .../test/TestTablesServiceSqlMap.java | 10 +- .../test/resources/test-services-setup.sql | 164 +++++++++--------- .../db/platform/AbstractDatabasePlatform.java | 4 +- .../platform/nuodb/NuoDbDatabasePlatform.java | 14 -- .../org/jumpmind/db/DatabasePlatformTest.java | 36 ++-- .../symmetric/test/SimpleIntegrationTest.java | 17 +- .../resources/test-integration-root-setup.sql | 104 +++++------ 35 files changed, 556 insertions(+), 594 deletions(-) diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManagerSqlMap.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManagerSqlMap.java index 483895bb8f..481a2417af 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManagerSqlMap.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManagerSqlMap.java @@ -30,19 +30,19 @@ public JobManagerSqlMap(IDatabasePlatform platform, Map replacem super(platform, replacementTokens); putSql("loadCustomJobs", - "select * from $(schemaName)$(job) order by job_type, job_name"); + "select * from $(job) order by job_type, job_name"); - putSql("insertJobSql", "insert into $(schemaName)$(job) (description, job_type, job_expression, " + putSql("insertJobSql", "insert into $(job) (description, job_type, job_expression, " + "default_auto_start, default_schedule, node_group_id, " + "create_by, create_time, last_update_by, last_update_time, job_name) " + "values (?, ?, ?, ?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)"); - putSql("updateJobSql", "update $(schemaName)$(job) set description = ?, job_type = ?, job_expression = ?, " + putSql("updateJobSql", "update $(job) set description = ?, job_type = ?, job_expression = ?, " + "default_auto_start = ?, default_schedule = ?, node_group_id = ?, " + "create_by = ?, last_update_by = ?, last_update_time = current_timestamp " + "where job_name = ?"); - putSql("deleteJobSql", "delete from $(schemaName)$(job) where job_name = ? and job_type <> 'BUILT_IN'"); + putSql("deleteJobSql", "delete from $(job) where job_name = ? and job_type <> 'BUILT_IN'"); } } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java index cb9159b5c7..467a163479 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java @@ -169,7 +169,7 @@ public String createInitalLoadSql(Node node, TriggerRouter triggerRouter, Table } sql = FormatUtils.replace("columns", columnsText, sql); } else { - sql = "select $(columns) from $(schemaName)$(tableName) t where $(whereClause)"; + sql = "select $(columns) from $(tableName) t where $(whereClause)"; StringBuilder columnList = new StringBuilder(); for (int i = 0; i < columns.length; i++) { Column column = columns[i]; diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java index 0861014e94..08907a6cf5 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java @@ -142,17 +142,12 @@ public static Map createSqlReplacementTokens(String tablePrefix, String quotedIdentifier, IDatabasePlatform platform) { Map map = new HashMap(); List tables = TableConstants.getTablesWithoutPrefix(); -// if(platform instanceof NuoDbDatabasePlatform){ -// for(String table : tables){ -// map.put(table, String.format("%s%s%s%s%s", platform.getDefaultSchema(), ".", tablePrefix, -// StringUtils.isNotBlank(tablePrefix) ? "_": "", table)); -// } -// }else{ + for (String table : tables) { map.put(table, String.format("%s%s%s", tablePrefix, StringUtils.isNotBlank(tablePrefix) ? "_" : "", table)); } -// } + return map; } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeServiceSqlMap.java index 86e6f92cfd..228fe4db4a 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeServiceSqlMap.java @@ -30,7 +30,7 @@ public AcknowledgeServiceSqlMap(IDatabasePlatform platform, Map replacementTokens) { super(platform, replacementTokens); putSql("selectDataIdSql", - "select data_id from $(schemaName)$(data_event) b where batch_id = ? order by data_id "); + "select data_id from $(data_event) b where batch_id = ? order by data_id "); } } \ No newline at end of file diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterServiceSqlMap.java index a5e2ea8e8c..5c1c6332bc 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterServiceSqlMap.java @@ -29,35 +29,35 @@ public class ClusterServiceSqlMap extends AbstractSqlMap { public ClusterServiceSqlMap(IDatabasePlatform platform, Map replacementTokens) { super(platform, replacementTokens); - putSql("deleteSql", "delete from $(schemaName)$(lock)"); + putSql("deleteSql", "delete from $(lock)"); putSql("acquireClusterLockSql", - "update $(schemaName)$(lock) set locking_server_id=?, lock_time=? " + + "update $(lock) set locking_server_id=?, lock_time=? " + "where lock_action=? and lock_type=? and (lock_time is null or lock_time < ? or locking_server_id=?)"); putSql("acquireSharedLockSql", - "update $(schemaName)$(lock) set lock_type=?, locking_server_id=?, lock_time=?, " + + "update $(lock) set lock_type=?, locking_server_id=?, lock_time=?, " + "shared_enable=(case when shared_count = 0 then 1 else shared_enable end), shared_count=shared_count+1 " + "where lock_action=? and (lock_type=? or lock_time is null or lock_time < ?) " + "and (shared_enable = 1 or shared_count = 0)"); putSql("disableSharedLockSql", - "update $(schemaName)$(lock) set shared_enable=0 where lock_action=? and lock_type=?"); + "update $(lock) set shared_enable=0 where lock_action=? and lock_type=?"); putSql("acquireExclusiveLockSql", - "update $(schemaName)$(lock) set lock_type=?, locking_server_id=?, lock_time=?, shared_count=0 " + + "update $(lock) set lock_type=?, locking_server_id=?, lock_time=?, shared_count=0 " + "where lock_action=? and ((lock_type=? and shared_count = 0) or lock_time is null or lock_time < ?)"); putSql("releaseClusterLockSql", - "update $(schemaName)$(lock) set last_locking_server_id=locking_server_id, locking_server_id=null, last_lock_time=lock_time, lock_time=null " + + "update $(lock) set last_locking_server_id=locking_server_id, locking_server_id=null, last_lock_time=lock_time, lock_time=null " + "where lock_action=? and lock_type=? and locking_server_id=?"); putSql("resetClusterLockSql", - "update $(schemaName)$(lock) set last_locking_server_id=null, locking_server_id=null, last_lock_time=null, lock_time=null " + + "update $(lock) set last_locking_server_id=null, locking_server_id=null, last_lock_time=null, lock_time=null " + "where lock_action=? and lock_type=? and locking_server_id=?"); putSql("releaseSharedLockSql", - "update $(schemaName)$(lock) set last_lock_time=lock_time, last_locking_server_id=locking_server_id, " + + "update $(lock) set last_lock_time=lock_time, last_locking_server_id=locking_server_id, " + "shared_enable=(case when shared_count = 1 then 0 else shared_enable end), " + "locking_server_id = (case when shared_count = 1 then null else locking_server_id end), " + "lock_time = (case when shared_count = 1 then null else lock_time end), " + @@ -65,23 +65,23 @@ public ClusterServiceSqlMap(IDatabasePlatform platform, Map repl "where lock_action=? and lock_type=?"); putSql("releaseExclusiveLockSql", - "update $(schemaName)$(lock) set last_locking_server_id=locking_server_id, locking_server_id=null, last_lock_time=lock_time, lock_time=null " + + "update $(lock) set last_locking_server_id=locking_server_id, locking_server_id=null, last_lock_time=lock_time, lock_time=null " + "where lock_action=? and lock_type=?"); putSql("initLockSql", - "update $(schemaName)$(lock) set last_locking_server_id=locking_server_id, locking_server_id=null, last_lock_time=lock_time, " + + "update $(lock) set last_locking_server_id=locking_server_id, locking_server_id=null, last_lock_time=lock_time, " + "lock_time=null, shared_count=0, shared_enable=0 " + "where locking_server_id=?"); - putSql("insertLockSql", "insert into $(schemaName)$(lock) (lock_action, lock_type) values(?,?)"); + putSql("insertLockSql", "insert into $(lock) (lock_action, lock_type) values(?,?)"); putSql("insertCompleteLockSql", - "insert into $(schemaName)$(lock) (lock_action, lock_type, locking_server_id, lock_time, shared_count, shared_enable, last_lock_time, last_locking_server_id) values(?,?,?,?,?,?,?,?)"); + "insert into $(lock) (lock_action, lock_type, locking_server_id, lock_time, shared_count, shared_enable, last_lock_time, last_locking_server_id) values(?,?,?,?,?,?,?,?)"); putSql("findLocksSql", "select lock_action, lock_type, locking_server_id, lock_time, shared_count, shared_enable, " + "last_locking_server_id, last_lock_time " + - "from $(schemaName)$(lock)"); + "from $(lock)"); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceSqlMap.java index 6c4daa28ec..5f76aa8608 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceSqlMap.java @@ -32,42 +32,42 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, // @formatter:off - putSql("updateNodeChannelLastExtractTime", "update $(schemaName)$(node_channel_ctl) set last_extract_time=? where channel_id=? and node_id=?"); + putSql("updateNodeChannelLastExtractTime", "update $(node_channel_ctl) set last_extract_time=? where channel_id=? and node_id=?"); putSql("selectDataEventActionsByIdSql", - " select data_event_action from $(schemaName)$(node_group_link) where " + " select data_event_action from $(node_group_link) where " + " source_node_group_id = ? and target_node_group_id = ? "); putSql("groupsLinksSql", "" + "select source_node_group_id, target_node_group_id, data_event_action, sync_config_enabled, is_reversible, last_update_time, last_update_by, create_time from " - + " $(schemaName)$(node_group_link) order by source_node_group_id "); + + " $(node_group_link) order by source_node_group_id "); putSql("updateNodeGroupSql", - " update $(schemaName)$(node_group) set description=?, last_update_time=?, last_update_by=? where " + " update $(node_group) set description=?, last_update_time=?, last_update_by=? where " + " node_group_id=? "); putSql("insertNodeGroupSql", - "insert into $(schemaName)$(node_group) " + "insert into $(node_group) " + " (description, node_group_id, last_update_time, last_update_by, create_time) values(?,?,?,?,?) "); putSql("updateNodeGroupLinkSql", "" - + "update $(schemaName)$(node_group_link) set data_event_action=?, sync_config_enabled=?, is_reversible=?, last_update_time=?, last_update_by=? where " + + "update $(node_group_link) set data_event_action=?, sync_config_enabled=?, is_reversible=?, last_update_time=?, last_update_by=? where " + " source_node_group_id=? and target_node_group_id=? "); putSql("insertNodeGroupLinkSql", - "insert into $(schemaName)$(node_group_link) " + "insert into $(node_group_link) " + " (data_event_action, source_node_group_id, target_node_group_id, sync_config_enabled, is_reversible, last_update_time, last_update_by, create_time) values(?,?,?,?,?,?,?,?)"); putSql("selectNodeGroupsSql", "" - + "select node_group_id, description, last_update_time, last_update_by, create_time from $(schemaName)$(node_group) order by node_group_id "); + + "select node_group_id, description, last_update_time, last_update_by, create_time from $(node_group) order by node_group_id "); putSql("groupsLinksForSql", "select source_node_group_id, target_node_group_id, data_event_action, sync_config_enabled, last_update_time, last_update_by, create_time from " - + " $(schemaName)$(node_group_link) where source_node_group_id = ? "); + + " $(node_group_link) where source_node_group_id = ? "); - putSql("countGroupLinksForSql","select count(*) from $(schemaName)$(node_group_link) where source_node_group_id = ? and target_node_group_id = ?"); + putSql("countGroupLinksForSql","select count(*) from $(node_group_link) where source_node_group_id = ? and target_node_group_id = ?"); - putSql("isChannelInUseSql", "select count(*) from $(schemaName)$(trigger) where channel_id = ? "); + putSql("isChannelInUseSql", "select count(*) from $(trigger) where channel_id = ? "); putSql("selectChannelsSql", "select c.channel_id, c.processing_order, c.max_batch_size, c.enabled, " + @@ -76,7 +76,7 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, " c.batch_algorithm, c.extract_period_millis, c.data_loader_type, " + " c.last_update_time, c.last_update_by, c.create_time, c.reload_flag, c.file_sync_flag, " + " c.queue, c.max_network_kbps, c.data_event_action " + - " from $(schemaName)$(channel) c order by c.processing_order asc, c.channel_id "); + " from $(channel) c order by c.processing_order asc, c.channel_id "); putSql("selectNodeChannelsSql", "select c.channel_id, nc.node_id, nc.ignore_enabled, nc.suspend_enabled, c.processing_order, " @@ -85,17 +85,17 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, + " nc.last_extract_time, c.extract_period_millis, c.data_loader_type, " + " last_update_time, last_update_by, create_time, c.reload_flag, c.file_sync_flag, c.queue, " + " c.max_network_kbps, c.data_event_action " - + " from $(schemaName)$(channel) c left outer join " - + " $(schemaName)$(node_channel_ctl) nc on c.channel_id = nc.channel_id and nc.node_id = ? " + + " from $(channel) c left outer join " + + " $(node_channel_ctl) nc on c.channel_id = nc.channel_id and nc.node_id = ? " + " order by c.processing_order asc, c.channel_id "); putSql("selectNodeChannelControlLastExtractTimeSql", "" + "select channel_id, last_extract_time " - + " from $(schemaName)$(node_channel_ctl) where node_id = ? " + + " from $(node_channel_ctl) where node_id = ? " + " order by channel_id "); putSql("insertChannelSql", - "insert into $(schemaName)$(channel) (channel_id, processing_order, max_batch_size, " + "insert into $(channel) (channel_id, processing_order, max_batch_size, " + " max_batch_to_send, max_data_to_route, use_old_data_to_route, use_row_data_to_route, " + " use_pk_data_to_route, contains_big_lob, enabled, batch_algorithm, description, " + " extract_period_millis, data_loader_type, last_update_time, last_update_by, " @@ -103,7 +103,7 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, + " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, null, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); putSql("updateChannelSql", - "update $(schemaName)$(channel) set processing_order=?, max_batch_size=?, " + "update $(channel) set processing_order=?, max_batch_size=?, " + " max_batch_to_send=?, max_data_to_route=?, use_old_data_to_route=?, use_row_data_to_route=?, " + " use_pk_data_to_route=?, contains_big_lob=?, enabled=?, batch_algorithm=?, extract_period_millis=?, " + " data_loader_type=?, last_update_time=?, last_update_by=?, reload_flag=?, file_sync_flag=?, queue=?, " @@ -111,34 +111,34 @@ public ConfigurationServiceSqlMap(IDatabasePlatform platform, + " where channel_id=? "); putSql("deleteNodeGroupLinkSql", - "delete from $(schemaName)$(node_group_link) where source_node_group_id=? and target_node_group_id=? "); + "delete from $(node_group_link) where source_node_group_id=? and target_node_group_id=? "); - putSql("deleteAllNodeGroupLinksSql", "delete from $(schemaName)$(node_group_link)"); + putSql("deleteAllNodeGroupLinksSql", "delete from $(node_group_link)"); - putSql("deleteNodeGroupSql", "delete from $(schemaName)$(node_group) where node_group_id=? "); + putSql("deleteNodeGroupSql", "delete from $(node_group) where node_group_id=? "); - putSql("deleteChannelSql", "delete from $(schemaName)$(channel) where channel_id=? "); + putSql("deleteChannelSql", "delete from $(channel) where channel_id=? "); - putSql("deleteNodeChannelSql", "delete from $(schemaName)$(node_channel_ctl) where channel_id=? "); + putSql("deleteNodeChannelSql", "delete from $(node_channel_ctl) where channel_id=? "); putSql("selectNodeGroupChannelWindowSql", "select node_group_id, channel_id, start_time, end_time, enabled " - + " from $(schemaName)$(node_group_channel_wnd) where node_group_id=? and channel_id=? "); + + " from $(node_group_channel_wnd) where node_group_id=? and channel_id=? "); putSql("insertNodeChannelControlSql", "" - + "insert into $(schemaName)$(node_channel_ctl) (node_id, channel_id, " + + "insert into $(node_channel_ctl) (node_id, channel_id, " + " suspend_enabled, ignore_enabled,last_extract_time) values (?, ?, ?, ?, ?) "); putSql("updateNodeChannelControlSql", - "update $(schemaName)$(node_channel_ctl) set " + "update $(node_channel_ctl) set " + " suspend_enabled=?, ignore_enabled=?, last_extract_time=? where node_id=? and channel_id=? "); putSql("getRegistrationRedirectSql", - "select registrant_external_id, registration_node_id from $(schemaName)$(registration_redirect)"); + "select registrant_external_id, registration_node_id from $(registration_redirect)"); - putSql("selectMaxChannelLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(channel) where last_update_time is not null" ); - putSql("selectMaxNodeGroupLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(node_group) where last_update_time is not null" ); - putSql("selectMaxNodeGroupLinkLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(node_group_link) where last_update_time is not null" ); + putSql("selectMaxChannelLastUpdateTime" ,"select max(last_update_time) from $(channel) where last_update_time is not null" ); + putSql("selectMaxNodeGroupLastUpdateTime" ,"select max(last_update_time) from $(node_group) where last_update_time is not null" ); + putSql("selectMaxNodeGroupLinkLastUpdateTime" ,"select max(last_update_time) from $(node_group_link) where last_update_time is not null" ); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ContextServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ContextServiceSqlMap.java index 69f3bca874..c4c10da7e3 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ContextServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ContextServiceSqlMap.java @@ -29,12 +29,12 @@ public class ContextServiceSqlMap extends AbstractSqlMap { public ContextServiceSqlMap(IDatabasePlatform platform, Map replacementTokens) { super(platform, replacementTokens); - putSql("selectSql", "select context_value from $(schemaName)$(context) where name = ?"); + putSql("selectSql", "select context_value from $(context) where name = ?"); - putSql("updateSql", "update $(schemaName)$(context) set context_value = ?, last_update_time = current_timestamp where name = ?"); + putSql("updateSql", "update $(context) set context_value = ?, last_update_time = current_timestamp where name = ?"); - putSql("insertSql", "insert into $(schemaName)$(context) (name, context_value, create_time) values (?, ?, current_timestamp)"); + putSql("insertSql", "insert into $(context) (name, context_value, create_time) values (?, ?, current_timestamp)"); - putSql("deleteSql", "delete from $(schemaName)$(context) where name = ?"); + putSql("deleteSql", "delete from $(context) where name = ?"); } } \ No newline at end of file diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorServiceSqlMap.java index a169f63e65..c896138904 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorServiceSqlMap.java @@ -31,15 +31,15 @@ public DataExtractorServiceSqlMap(IDatabasePlatform platform, super(platform, replacementTokens); // @formatter:off - putSql("selectNodeIdsForExtractSql", "select node_id, queue from $(schemaName)$(extract_request) where status=? group by node_id, queue"); + putSql("selectNodeIdsForExtractSql", "select node_id, queue from $(extract_request) where status=? group by node_id, queue"); - putSql("selectExtractRequestForNodeSql", "select * from $(schemaName)$(extract_request) where node_id=? and queue=? and status=? order by request_id"); + putSql("selectExtractRequestForNodeSql", "select * from $(extract_request) where node_id=? and queue=? and status=? order by request_id"); - putSql("insertExtractRequestSql", "insert into $(schemaName)$(extract_request) (request_id, node_id, queue, status, start_batch_id, end_batch_id, trigger_id, router_id, last_update_time, create_time) values(?, ?, ?, ?, ?, ?, ?, ?, current_timestamp, current_timestamp)"); + putSql("insertExtractRequestSql", "insert into $(extract_request) (request_id, node_id, queue, status, start_batch_id, end_batch_id, trigger_id, router_id, last_update_time, create_time) values(?, ?, ?, ?, ?, ?, ?, ?, current_timestamp, current_timestamp)"); - putSql("updateExtractRequestStatus", "update $(schemaName)$(extract_request) set status=? where request_id=?"); + putSql("updateExtractRequestStatus", "update $(extract_request) set status=? where request_id=?"); - putSql("resetExtractRequestStatus", "update $(schemaName)$(extract_request) set status=? where start_batch_id <= ? and end_batch_id >= ? and node_id=?"); + putSql("resetExtractRequestStatus", "update $(extract_request) set status=? where start_batch_id <= ? and end_batch_id >= ? and node_id=?"); } } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderServiceSqlMap.java index 6ee63f5c6e..a68c4f68d3 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderServiceSqlMap.java @@ -32,7 +32,7 @@ public class DataLoaderServiceSqlMap extends AbstractSqlMap { // @formatter:off putSql("updateConflictSettingsSql", - "update $(schemaName)$(conflict) set " + + "update $(conflict) set " + "source_node_group_id=?, target_node_group_id=?, " + "target_channel_id=?, target_catalog_name=?, target_schema_name=?, target_table_name=?, " + "detect_type=?, resolve_type=?, ping_back=?, resolve_changes_only=?, " + @@ -40,7 +40,7 @@ public class DataLoaderServiceSqlMap extends AbstractSqlMap { "last_update_by=?, last_update_time=current_timestamp where conflict_id=? "); putSql("insertConflictSettingsSql", - "insert into $(schemaName)$(conflict) ( " + + "insert into $(conflict) ( " + "source_node_group_id, target_node_group_id, " + "target_channel_id, target_catalog_name, target_schema_name, target_table_name, " + "detect_type, resolve_type, ping_back, " + @@ -48,9 +48,9 @@ public class DataLoaderServiceSqlMap extends AbstractSqlMap { "create_time, last_update_by, last_update_time, conflict_id) " + "values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)"); - putSql("deleteConflictSettingsSql", "delete from $(schemaName)$(conflict) where conflict_id=?"); + putSql("deleteConflictSettingsSql", "delete from $(conflict) where conflict_id=?"); - putSql("deleteAllConflictSettingsSql", "delete from $(schemaName)$(conflict)"); + putSql("deleteAllConflictSettingsSql", "delete from $(conflict)"); putSql("selectConflictSettingsSql", "select " + @@ -58,34 +58,34 @@ public class DataLoaderServiceSqlMap extends AbstractSqlMap { "target_channel_id, target_catalog_name, target_schema_name, target_table_name, " + "detect_type, resolve_type, ping_back, " + "resolve_changes_only, resolve_row_only, detect_expression, " + - "create_time, last_update_by, last_update_time, conflict_id from $(schemaName)$(conflict) "); + "create_time, last_update_by, last_update_time, conflict_id from $(conflict) "); putSql("selectIncomingErrorSql", "select batch_id, node_id, failed_row_number, failed_line_number, target_catalog_name, target_schema_name, " + "target_table_name, event_type, binary_encoding, column_names, pk_column_names, row_data, " + "old_data, cur_data, resolve_data, resolve_ignore, conflict_id, " + - "create_time, last_update_by, last_update_time from $(schemaName)$(incoming_error) where batch_id = ? and node_id = ?"); + "create_time, last_update_by, last_update_time from $(incoming_error) where batch_id = ? and node_id = ?"); putSql("selectCurrentIncomingErrorSql", "select e.batch_id, e.node_id, e.failed_row_number, e.failed_line_number, e.target_catalog_name, e.target_schema_name, " + "e.target_table_name, e.event_type, e.binary_encoding, e.column_names, e.pk_column_names, e.row_data, " + "e.old_data, e.cur_data, e.resolve_data, e.resolve_ignore, e.conflict_id, " + "e.create_time, e.last_update_by, e.last_update_time " + - "from $(schemaName)$(incoming_error) e inner join $(schemaName)$(incoming_batch) b on b.batch_id = e.batch_id " + + "from $(incoming_error) e inner join $(incoming_batch) b on b.batch_id = e.batch_id " + "and b.node_id = e.node_id and b.failed_row_number = e.failed_row_number " + "where b.batch_id = ? and b.node_id = ?"); putSql("selectMaxLastUpdateTime" ,"" + -"select max(last_update_time) from $(schemaName)$(conflict) where last_update_time is not null" ); +"select max(last_update_time) from $(conflict) where last_update_time is not null" ); putSql("insertIncomingErrorSql", - "insert into $(schemaName)$(incoming_error) " + + "insert into $(incoming_error) " + "(batch_id, node_id, failed_row_number, failed_line_number, target_catalog_name, target_schema_name, " + "target_table_name, event_type, binary_encoding, column_names, pk_column_names, row_data, old_data, cur_data, resolve_data, resolve_ignore, conflict_id, " + "create_time, last_update_by, last_update_time) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); putSql("updateIncomingErrorSql", - "update $(schemaName)$(incoming_error) set resolve_data = ?, resolve_ignore = ? " + + "update $(incoming_error) set resolve_data = ?, resolve_ignore = ? " + "where batch_id = ? and node_id = ? and failed_row_number = ?"); // @formatter:on diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataServiceSqlMap.java index d13cae8334..6645fdfb7d 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataServiceSqlMap.java @@ -29,100 +29,100 @@ public class DataServiceSqlMap extends AbstractSqlMap { public DataServiceSqlMap(IDatabasePlatform platform, Map replacementTokens) { super(platform, replacementTokens); - putSql("selectTableReloadRequest", "select reload_select, before_custom_sql, reload_time, create_time, last_update_by, last_update_time from $(schemaName)$(table_reload_request) where source_node_id=? and target_node_id=? and trigger_id=? and router_id=?"); + putSql("selectTableReloadRequest", "select reload_select, before_custom_sql, reload_time, create_time, last_update_by, last_update_time from $(table_reload_request) where source_node_id=? and target_node_id=? and trigger_id=? and router_id=?"); - putSql("insertTableReloadRequest", "insert into $(schemaName)$(table_reload_request) (reload_select, before_custom_sql, create_time, last_update_by, last_update_time, source_node_id, target_node_id, trigger_id, router_id, create_table, delete_first, channel_id) values (?,?,?,?,?,?,?,?,?,?,?,?)"); + putSql("insertTableReloadRequest", "insert into $(table_reload_request) (reload_select, before_custom_sql, create_time, last_update_by, last_update_time, source_node_id, target_node_id, trigger_id, router_id, create_table, delete_first, channel_id) values (?,?,?,?,?,?,?,?,?,?,?,?)"); - putSql("updateTableReloadRequest", "update $(schemaName)$(table_reload_request) set reload_select=?, before_custom_sql=?, reload_time=?, create_time=?, last_update_by=?, last_update_time=? where source_node_id=? and target_node_id=? and trigger_id=? and router_id=?"); + putSql("updateTableReloadRequest", "update $(table_reload_request) set reload_select=?, before_custom_sql=?, reload_time=?, create_time=?, last_update_by=?, last_update_time=? where source_node_id=? and target_node_id=? and trigger_id=? and router_id=?"); - putSql("deleteTableReloadRequest", "delete from $(schemaName)$(table_reload_request) where source_node_id=? and target_node_id=? and trigger_id=? and router_id=?"); + putSql("deleteTableReloadRequest", "delete from $(table_reload_request) where source_node_id=? and target_node_id=? and trigger_id=? and router_id=?"); putSql("selectTableReloadRequestToProcess", "select target_node_id, create_table, delete_first, reload_select, before_custom_sql, " + " reload_time, channel_id, create_time, last_update_by, " + " last_update_time, trigger_id, router_id " - + " from $(schemaName)$(table_reload_request) " + + " from $(table_reload_request) " + " where source_node_id=? and processed = 0 " + " order by create_time, target_node_id"); - putSql("updateProcessedTableReloadRequest", "update $(schemaName)$(table_reload_request) set load_id = ?, last_update_time = ?, processed = 1 where target_node_id = ? and source_node_id = ? and trigger_id = ? and router_id = ? and create_time = ?"); + putSql("updateProcessedTableReloadRequest", "update $(table_reload_request) set load_id = ?, last_update_time = ?, processed = 1 where target_node_id = ? and source_node_id = ? and trigger_id = ? and router_id = ? and create_time = ?"); // Note that the order by data_id is done appended in code putSql("selectEventDataToExtractSql", "" + "select d.data_id, d.table_name, d.event_type, d.row_data as row_data, d.pk_data as pk_data, d.old_data as old_data, " - + " d.create_time, d.trigger_hist_id, d.channel_id, d.transaction_id, d.source_node_id, d.external_data, d.node_list, e.router_id from $(schemaName)$(data) d inner join " - + " $(schemaName)$(data_event) e on d.data_id = e.data_id inner join $(schemaName)$(outgoing_batch) o on o.batch_id=e.batch_id " + + " d.create_time, d.trigger_hist_id, d.channel_id, d.transaction_id, d.source_node_id, d.external_data, d.node_list, e.router_id from $(data) d inner join " + + " $(data_event) e on d.data_id = e.data_id inner join $(outgoing_batch) o on o.batch_id=e.batch_id " + " where o.batch_id = ? and o.node_id = ? "); putSql("selectEventDataByBatchIdSql", "" + "select d.data_id, d.table_name, d.event_type, d.row_data as row_data, d.pk_data as pk_data, d.old_data as old_data, " - + " d.create_time, d.trigger_hist_id, d.channel_id, d.transaction_id, d.source_node_id, d.external_data, d.node_list, e.router_id from $(schemaName)$(data) d inner join " - + " $(schemaName)$(data_event) e on d.data_id = e.data_id inner join $(schemaName)$(outgoing_batch) o on o.batch_id=e.batch_id " + + " d.create_time, d.trigger_hist_id, d.channel_id, d.transaction_id, d.source_node_id, d.external_data, d.node_list, e.router_id from $(data) d inner join " + + " $(data_event) e on d.data_id = e.data_id inner join $(outgoing_batch) o on o.batch_id=e.batch_id " + " where o.batch_id = ? "); putSql("selectEventDataIdsSql", "" - + "select d.data_id from $(schemaName)$(data) d inner join " - + " $(schemaName)$(data_event) e on d.data_id = e.data_id inner join $(schemaName)$(outgoing_batch) o on o.batch_id=e.batch_id " + + "select d.data_id from $(data) d inner join " + + " $(data_event) e on d.data_id = e.data_id inner join $(outgoing_batch) o on o.batch_id=e.batch_id " + " where o.batch_id = ? and o.node_id = ? "); putSql("selectData", "select data_id, table_name, event_type, row_data, pk_data, old_data, " + "create_time, trigger_hist_id, channel_id, transaction_id, source_node_id, external_data, node_list, '' as router_id " + - "from $(schemaName)$(data) where data_id = ?"); + "from $(data) where data_id = ?"); putSql("selectMaxDataEventDataIdSql", "" - + "select max(data_id) from $(schemaName)$(data_event) "); + + "select max(data_id) from $(data_event) "); putSql("countDataInRangeSql", "" - + "select count(*) from $(schemaName)$(data) where data_id > ? and data_id < ? "); + + "select count(*) from $(data) where data_id > ? and data_id < ? "); putSql("insertIntoDataSql", "" - + "insert into $(schemaName)$(data) (data_id, table_name, event_type, row_data, pk_data, " + + "insert into $(data) (data_id, table_name, event_type, row_data, pk_data, " + " old_data, trigger_hist_id, channel_id, external_data, node_list, create_time) values(null, ?, ?, ?, ?, ?, ?, ?, ?, ?, current_timestamp) "); putSql("insertIntoDataEventSql", "" - + "insert into $(schemaName)$(data_event) (data_id, batch_id, router_id, create_time) values(?, ?, ?, current_timestamp) "); + + "insert into $(data_event) (data_id, batch_id, router_id, create_time) values(?, ?, ?, current_timestamp) "); putSql("findDataEventCreateTimeSql", "" - + "select max(create_time) from $(schemaName)$(data_event) where data_id=? "); + + "select max(create_time) from $(data_event) where data_id=? "); putSql("findDataCreateTimeSql", "" - + "select create_time from $(schemaName)$(data) where data_id=? "); + + "select create_time from $(data) where data_id=? "); putSql("findMinDataSql", "" - + "select min(data_id) from $(schemaName)$(data) where data_id >= ?"); + + "select min(data_id) from $(data) where data_id >= ?"); - putSql("countDataGapsByStatusSql", "select count(*) from $(schemaName)$(data_gap) where status = ?"); + putSql("countDataGapsByStatusSql", "select count(*) from $(data_gap) where status = ?"); putSql("findDataGapsByStatusSql", "" - + "select start_id, end_id, create_time from $(schemaName)$(data_gap) where status=? order by start_id asc "); + + "select start_id, end_id, create_time from $(data_gap) where status=? order by start_id asc "); putSql("insertDataGapSql", "" - + "insert into $(schemaName)$(data_gap) (status, last_update_hostname, start_id, end_id, last_update_time, create_time) values(?, ?, ?, ?, ?, ?) "); + + "insert into $(data_gap) (status, last_update_hostname, start_id, end_id, last_update_time, create_time) values(?, ?, ?, ?, ?, ?) "); putSql("updateDataGapSql", "" - + "update $(schemaName)$(data_gap) set status=?, last_update_hostname=?, last_update_time=? where start_id=? and end_id=? "); + + "update $(data_gap) set status=?, last_update_hostname=?, last_update_time=? where start_id=? and end_id=? "); putSql("deleteDataGapSql", - "delete from $(schemaName)$(data_gap) where start_id=? and end_id=? "); + "delete from $(data_gap) where start_id=? and end_id=? "); - putSql("deleteAllDataGapsSql", "delete from $(schemaName)$(data_gap)"); + putSql("deleteAllDataGapsSql", "delete from $(data_gap)"); - putSql("selectMaxDataIdSql", "select max(data_id) from $(schemaName)$(data) "); + putSql("selectMaxDataIdSql", "select max(data_id) from $(data) "); - putSql("selectMinDataIdSql", "select min(data_id) from $(schemaName)$(data) "); + putSql("selectMinDataIdSql", "select min(data_id) from $(data) "); - putSql("deleteCapturedConfigChannelDataSql", "delete from $(schemaName)$(data) where channel_id='config'"); + putSql("deleteCapturedConfigChannelDataSql", "delete from $(data) where channel_id='config'"); putSql("findLastCaptureTimeByChannelSql", - "select max(create_time) as create_time, channel_id from $(schemaName)$(data) group by channel_id "); + "select max(create_time) as create_time, channel_id from $(data) group by channel_id "); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ExtensionServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ExtensionServiceSqlMap.java index ddd2e8d034..da23bb5fe9 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ExtensionServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ExtensionServiceSqlMap.java @@ -30,21 +30,21 @@ public ExtensionServiceSqlMap(IDatabasePlatform platform, Map re super(platform, replacementTokens); putSql("selectEnabled", "select extension_id, extension_type, interface_name, node_group_id, enabled, extension_order, " + - "extension_text, create_time, last_update_by, last_update_time from $(schemaName)$(extension) " + + "extension_text, create_time, last_update_by, last_update_time from $(extension) " + "where enabled = 1 and (node_group_id = ? or node_group_id='ALL') order by extension_order"); putSql("selectAll", "select extension_id, extension_type, interface_name, node_group_id, enabled, extension_order, " + - "extension_text, create_time, last_update_by, last_update_time from $(schemaName)$(extension)"); + "extension_text, create_time, last_update_by, last_update_time from $(extension)"); - putSql("insertExtensionSql", "insert into $(schemaName)$(extension) (extension_type, interface_name, node_group_id, enabled, " + + putSql("insertExtensionSql", "insert into $(extension) (extension_type, interface_name, node_group_id, enabled, " + "extension_order, extension_text, create_time, last_update_by, last_update_time, extension_id) " + "values (?, ?, ?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)"); - putSql("updateExtensionSql", "update $(schemaName)$(extension) set extension_type = ?, interface_name = ?, " + + putSql("updateExtensionSql", "update $(extension) set extension_type = ?, interface_name = ?, " + "node_group_id = ?, enabled = ?, extension_order = ?, extension_text = ?, last_update_by = ?, " + "last_update_time = current_timestamp where extension_id = ?"); - putSql("deleteExtensionSql", "delete from $(schemaName)$(extension) where extension_id = ?"); + putSql("deleteExtensionSql", "delete from $(extension) where extension_id = ?"); } } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncServiceSqlMap.java index 318abd7164..b99cd30cb4 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncServiceSqlMap.java @@ -40,12 +40,12 @@ public FileSyncServiceSqlMap(IDatabasePlatform platform, Map rep " after_copy_script, " + " create_time, last_update_by, " + " last_update_time, channel_id, reload_channel_id " + - " from $(schemaName)$(file_trigger) "); + " from $(file_trigger) "); putSql("triggerIdWhere", "where trigger_id=?"); putSql("updateFileTriggerSql", - " update $(schemaName)$(file_trigger) set base_dir=?, recurse=?, includes_files=?, " + + " update $(file_trigger) set base_dir=?, recurse=?, includes_files=?, " + " excludes_files=?, sync_on_create=?, sync_on_modified=?, sync_on_delete=?, " + " sync_on_ctl_file=?, delete_after_sync=?, " + " before_copy_script=?, after_copy_script=?, " + @@ -53,7 +53,7 @@ public FileSyncServiceSqlMap(IDatabasePlatform platform, Map rep "where trigger_id=? "); putSql("insertFileTriggerSql", - " insert into $(schemaName)$(file_trigger) (base_dir, recurse, includes_files, " + + " insert into $(file_trigger) (base_dir, recurse, includes_files, " + " excludes_files, sync_on_create, sync_on_modified, sync_on_delete, " + " sync_on_ctl_file, delete_after_sync, " + " before_copy_script, after_copy_script, " + @@ -65,12 +65,12 @@ public FileSyncServiceSqlMap(IDatabasePlatform platform, Map rep " select trigger_id, router_id, channel_id, reload_channel_id, relative_dir, file_name, " + " last_event_type, crc32_checksum, " + " file_size, file_modified_time, create_time, last_update_time, last_update_by " + - " from $(schemaName)$(file_snapshot) where trigger_id=? and router_id=? "); + " from $(file_snapshot) where trigger_id=? and router_id=? "); putSql("relativeDirWhere", "and relative_dir=?"); putSql("updateFileSnapshotSql", - " update $(schemaName)$(file_snapshot) set " + + " update $(file_snapshot) set " + " last_event_type=?, crc32_checksum=?, " + " file_size=?, file_modified_time=?, last_update_time=?, " + " last_update_by=?, channel_id=?, reload_channel_id=? " + @@ -78,7 +78,7 @@ public FileSyncServiceSqlMap(IDatabasePlatform platform, Map rep " trigger_id=? and router_id=? and relative_dir=? and file_name=? "); putSql("updateFileIncoming", - " update $(schemaName)$(file_incoming) set " + + " update $(file_incoming) set " + " node_id=?, " + " file_modified_time=?, " + " last_event_type=? " + @@ -86,22 +86,22 @@ public FileSyncServiceSqlMap(IDatabasePlatform platform, Map rep " relative_dir=? and file_name=? "); putSql("insertFileIncoming", - " insert into $(schemaName)$(file_incoming) (node_id, file_modified_time, last_event_type, relative_dir, file_name) " + + " insert into $(file_incoming) (node_id, file_modified_time, last_event_type, relative_dir, file_name) " + " values(?,?,?,?,?) "); putSql("deleteFileIncoming", - " delete from $(schemaName)$(file_incoming)"); + " delete from $(file_incoming)"); putSql("findNodeIdFromFileIncoming", - " select node_id from $(schemaName)$(file_incoming) where relative_dir=? and file_name=? and file_modified_time=?"); + " select node_id from $(file_incoming) where relative_dir=? and file_name=? and file_modified_time=?"); putSql("deleteFileSnapshotSql", - " delete from $(schemaName)$(file_snapshot) " + + " delete from $(file_snapshot) " + " where " + " trigger_id=? and router_id=? and relative_dir=? and file_name=? "); putSql("insertFileSnapshotSql", - " insert into $(schemaName)$(file_snapshot) ( " + + " insert into $(file_snapshot) ( " + " last_event_type, crc32_checksum, " + " file_size, file_modified_time, create_time, last_update_time, " + " last_update_by, channel_id, reload_channel_id, trigger_id, router_id, relative_dir, file_name " + @@ -113,34 +113,34 @@ public FileSyncServiceSqlMap(IDatabasePlatform platform, Map rep " initial_load_enabled, target_base_dir, " + " conflict_strategy, tr.create_time as create_time, " + " tr.last_update_by as last_update_by, tr.last_update_time as last_update_time " + - " from $(schemaName)$(file_trigger_router) tr "); + " from $(file_trigger_router) tr "); putSql("whereTriggerRouterId", "where trigger_id=? and router_id=?"); putSql("fileTriggerRoutersForCurrentNodeWhere", " " + - " inner join $(schemaName)$(router) r on " + + " inner join $(router) r on " + " tr.router_id=r.router_id " + " where r.source_node_group_id=?"); putSql("updateFileTriggerRouterSql", - " update $(schemaName)$(file_trigger_router) set " + + " update $(file_trigger_router) set " + " enabled=?, initial_load_enabled=?, target_base_dir=?, " + " conflict_strategy=?, last_update_by=?, last_update_time=? " + " where trigger_id=? and router_id=? "); putSql("insertFileTriggerRouterSql", - " insert into $(schemaName)$(file_trigger_router) ( " + + " insert into $(file_trigger_router) ( " + " enabled, initial_load_enabled, target_base_dir, " + " conflict_strategy, create_time, last_update_by, " + " last_update_time, trigger_id, router_id " + " ) values(?,?,?,?,?,?,?,?,?) "); putSql("deleteFileTriggerRouterSql", "" - + "delete from $(schemaName)$(file_trigger_router) where trigger_id=? and router_id=? "); + + "delete from $(file_trigger_router) where trigger_id=? and router_id=? "); - putSql("deleteAllFileTriggerRoutersSql", "delete from $(schemaName)$(file_trigger_router)"); + putSql("deleteAllFileTriggerRoutersSql", "delete from $(file_trigger_router)"); - putSql("deleteFileTriggerSql", "" + "delete from $(schemaName)$(file_trigger) where trigger_id=? "); + putSql("deleteFileTriggerSql", "" + "delete from $(file_trigger) where trigger_id=? "); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/GroupletServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/GroupletServiceSqlMap.java index 84bd3b8fd4..f937f5244e 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/GroupletServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/GroupletServiceSqlMap.java @@ -28,29 +28,29 @@ public class GroupletServiceSqlMap extends AbstractSqlMap { public GroupletServiceSqlMap(IDatabasePlatform platform, Map replacementTokens) { super(platform, replacementTokens); - putSql("selectGroupletSql", "select grouplet_id, grouplet_link_policy, description, create_time, last_update_by, last_update_time from $(schemaName)$(grouplet)"); - putSql("selectGroupletLinkSql", "select grouplet_id, external_id, create_time, last_update_by, last_update_time from $(schemaName)$(grouplet_link)"); - putSql("selectTriggerRouterGroupletSql", "select grouplet_id, trigger_id, router_id, applies_when, create_time, last_update_by, last_update_time from $(schemaName)$(trigger_router_grouplet)"); + putSql("selectGroupletSql", "select grouplet_id, grouplet_link_policy, description, create_time, last_update_by, last_update_time from $(grouplet)"); + putSql("selectGroupletLinkSql", "select grouplet_id, external_id, create_time, last_update_by, last_update_time from $(grouplet_link)"); + putSql("selectTriggerRouterGroupletSql", "select grouplet_id, trigger_id, router_id, applies_when, create_time, last_update_by, last_update_time from $(trigger_router_grouplet)"); - putSql("updateGroupletSql", "update $(schemaName)$(grouplet) set grouplet_link_policy=?, description=?, create_time=?, last_update_by=?, last_update_time=? where grouplet_id=?"); - putSql("insertGroupletSql", "insert into $(schemaName)$(grouplet) (grouplet_link_policy, description, create_time, last_update_by, last_update_time, grouplet_id) values(?,?,?,?,?,?)"); - putSql("deleteGroupletSql", "delete from $(schemaName)$(grouplet) where grouplet_id=?"); - putSql("deleteAllGroupletsSql", "delete from $(schemaName)$(grouplet)"); + putSql("updateGroupletSql", "update $(grouplet) set grouplet_link_policy=?, description=?, create_time=?, last_update_by=?, last_update_time=? where grouplet_id=?"); + putSql("insertGroupletSql", "insert into $(grouplet) (grouplet_link_policy, description, create_time, last_update_by, last_update_time, grouplet_id) values(?,?,?,?,?,?)"); + putSql("deleteGroupletSql", "delete from $(grouplet) where grouplet_id=?"); + putSql("deleteAllGroupletsSql", "delete from $(grouplet)"); - putSql("updateGroupletLinkSql", "update $(schemaName)$(grouplet_link) set create_time=?, last_update_by=?, last_update_time=? where grouplet_id=? and external_id=?"); - putSql("insertGroupletLinkSql", "insert into $(schemaName)$(grouplet_link) (create_time, last_update_by, last_update_time, grouplet_id, external_id) values(?,?,?,?,?)"); - putSql("deleteGroupletLinkSql", "delete from $(schemaName)$(grouplet_link) where grouplet_id=? and external_id=?"); - putSql("deleteAllGroupletLinksSql", "delete from $(schemaName)$(grouplet_link)"); + putSql("updateGroupletLinkSql", "update $(grouplet_link) set create_time=?, last_update_by=?, last_update_time=? where grouplet_id=? and external_id=?"); + putSql("insertGroupletLinkSql", "insert into $(grouplet_link) (create_time, last_update_by, last_update_time, grouplet_id, external_id) values(?,?,?,?,?)"); + putSql("deleteGroupletLinkSql", "delete from $(grouplet_link) where grouplet_id=? and external_id=?"); + putSql("deleteAllGroupletLinksSql", "delete from $(grouplet_link)"); - putSql("updateTriggerRouterGroupletSql", "update $(schemaName)$(trigger_router_grouplet) set create_time=?, last_update_by=?, last_update_time=? where grouplet_id=? and applies_when=? and trigger_id=? and router_id=?"); - putSql("insertTriggerRouterGroupletSql", "insert into $(schemaName)$(trigger_router_grouplet) (create_time, last_update_by, last_update_time, grouplet_id, applies_when, trigger_id, router_id) values(?,?,?,?,?,?,?)"); - putSql("deleteTriggerRouterGroupletSql", "delete from $(schemaName)$(trigger_router_grouplet) where grouplet_id=? and applies_when=? and trigger_id=? and router_id=?"); - putSql("deleteAllTriggerRouterGroupletsSql", "delete from $(schemaName)$(trigger_router_grouplet)"); - putSql("deleteTriggerRouterGroupletForSql", "delete from $(schemaName)$(trigger_router_grouplet) where trigger_id=? and router_id=?"); + putSql("updateTriggerRouterGroupletSql", "update $(trigger_router_grouplet) set create_time=?, last_update_by=?, last_update_time=? where grouplet_id=? and applies_when=? and trigger_id=? and router_id=?"); + putSql("insertTriggerRouterGroupletSql", "insert into $(trigger_router_grouplet) (create_time, last_update_by, last_update_time, grouplet_id, applies_when, trigger_id, router_id) values(?,?,?,?,?,?,?)"); + putSql("deleteTriggerRouterGroupletSql", "delete from $(trigger_router_grouplet) where grouplet_id=? and applies_when=? and trigger_id=? and router_id=?"); + putSql("deleteAllTriggerRouterGroupletsSql", "delete from $(trigger_router_grouplet)"); + putSql("deleteTriggerRouterGroupletForSql", "delete from $(trigger_router_grouplet) where trigger_id=? and router_id=?"); - putSql("selectMaxGroupletLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(grouplet) where last_update_time is not null" ); - putSql("selectMaxGroupletLinkLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(grouplet_link) where last_update_time is not null" ); - putSql("selectMaxTriggerRouterGroupletLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(trigger_router_grouplet) where last_update_time is not null" ); + putSql("selectMaxGroupletLastUpdateTime" ,"select max(last_update_time) from $(grouplet) where last_update_time is not null" ); + putSql("selectMaxGroupletLinkLastUpdateTime" ,"select max(last_update_time) from $(grouplet_link) where last_update_time is not null" ); + putSql("selectMaxTriggerRouterGroupletLastUpdateTime" ,"select max(last_update_time) from $(trigger_router_grouplet) where last_update_time is not null" ); } } 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 5cb3feeda2..77b88347c4 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 @@ -44,10 +44,10 @@ public IncomingBatchServiceSqlMap(IDatabasePlatform platform, Map r " create_time, last_update_by, last_update_time, " + " load_filter_order, fail_on_error " + " from " + -" $(schemaName)$(load_filter) order by load_filter_order "); +" $(load_filter) order by load_filter_order "); putSql("updateLoadFilterSql" ,"" + "update " + -" $(schemaName)$(load_filter) " + +" $(load_filter) " + " set " + " after_write_script=?, " + " batch_commit_script=?, " + @@ -72,7 +72,7 @@ public LoadFilterServiceSqlMap(IDatabasePlatform platform, Map r " load_filter_id=? " ); putSql("insertLoadFilterSql" ,"" + -"insert into $(schemaName)$(load_filter) (" + +"insert into $(load_filter) (" + " after_write_script, " + " batch_commit_script, " + " batch_complete_script, " + @@ -97,11 +97,11 @@ public LoadFilterServiceSqlMap(IDatabasePlatform platform, Map r " ) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,current_timestamp,?) " ); putSql("deleteLoadFilterSql" ,"" + -"delete from $(schemaName)$(load_filter) where " + +"delete from $(load_filter) where " + " load_filter_id=? " ); putSql("selectMaxLastUpdateTime" ,"" + -"select max(last_update_time) from $(schemaName)$(load_filter) where last_update_time is not null" ); +"select max(last_update_time) from $(load_filter) where last_update_time is not null" ); // @formatter:on diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationServiceSqlMap.java index b4dcff279d..669d1a98ce 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationServiceSqlMap.java @@ -30,34 +30,34 @@ public NodeCommunicationServiceSqlMap(IDatabasePlatform platform, Map replacementTokens) { super(platform, replacementTokens); - putSql("deleteSql", "delete from $(schemaName)$(node_communication)"); + putSql("deleteSql", "delete from $(node_communication)"); - putSql("clearLocksOnRestartSql", "update $(schemaName)$(node_communication) set lock_time=null where locking_server_id=? and lock_time is not null"); + putSql("clearLocksOnRestartSql", "update $(node_communication) set lock_time=null where locking_server_id=? and lock_time is not null"); putSql("selectNodeCommunicationSql", - "select * from $(schemaName)$(node_communication) where communication_type=? order by node_priority DESC,last_lock_time"); + "select * from $(node_communication) where communication_type=? order by node_priority DESC,last_lock_time"); putSql("selectNodeCommunicationPullSql", - "select * from $(schemaName)$(node_communication) where communication_type=? order by node_priority DESC,batch_to_send_count DESC,last_lock_time"); + "select * from $(node_communication) where communication_type=? order by node_priority DESC,batch_to_send_count DESC,last_lock_time"); putSql("selectNodeCommunicationByNodeAndChannelSql", - "select * from $(schemaName)$(node_communication) where node_id=? and queue=? and communication_type=?"); + "select * from $(node_communication) where node_id=? and queue=? and communication_type=?"); - putSql("insertNodeCommunicationSql", "insert into $(schemaName)$(node_communication) (" + putSql("insertNodeCommunicationSql", "insert into $(node_communication) (" + "lock_time,locking_server_id,last_lock_millis,success_count,fail_count," + "total_success_count,total_fail_count,total_success_millis,total_fail_millis,last_lock_time,batch_to_send_count,node_priority," + "node_id,queue,communication_type) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); putSql("updateNodeCommunicationSql", - "update $(schemaName)$(node_communication) set lock_time=?,locking_server_id=?,last_lock_millis=?," + "update $(node_communication) set lock_time=?,locking_server_id=?,last_lock_millis=?," + "success_count=?,fail_count=?,total_success_count=?,total_fail_count=?," + "total_success_millis=?,total_fail_millis=?, last_lock_time=?, batch_to_send_count=?, node_priority=? " + "where node_id=? and queue=? and communication_type=?"); putSql("deleteNodeCommunicationSql", - "delete from $(schemaName)$(node_communication) where node_id=? and queue=? and communication_type=?"); + "delete from $(node_communication) where node_id=? and queue=? and communication_type=?"); putSql("aquireLockSql", - "update $(schemaName)$(node_communication) set locking_server_id=?, lock_time=?, last_lock_time=? where " + "update $(node_communication) set locking_server_id=?, lock_time=?, last_lock_time=? where " + " node_id=? and queue=? and communication_type=? and " + " (lock_time is null or lock_time < ?) "); diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeServiceSqlMap.java index f70f01994a..503e41f3b8 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeServiceSqlMap.java @@ -30,32 +30,32 @@ public NodeServiceSqlMap(IDatabasePlatform platform, Map replace super(platform, replacementTokens); putSql("findSymmetricVersionSql", - "select symmetric_version from $(schemaName)$(node) " + "select symmetric_version from $(node) " + " where node_id in (select node_id from $(node_identity)) "); - putSql("insertNodeIdentitySql", "" + "insert into $(schemaName)$(node_identity) values(?) "); + putSql("insertNodeIdentitySql", "" + "insert into $(node_identity) values(?) "); putSql("doesNodeGroupExistSql", "" - + "select count(*) from $(schemaName)$(node_group) where node_group_id=? "); + + "select count(*) from $(node_group) where node_group_id=? "); putSql("insertNodeGroupSql", "" - + "insert into $(schemaName)$(node_group) (description, node_group_id) values(?, ?) "); + + "insert into $(node_group) (description, node_group_id) values(?, ?) "); putSql("nodeChannelControlIgnoreSql", "" - + "update $(schemaName)$(node_channel_ctl) set ignore_enabled=? where node_id=? and " + + "update $(node_channel_ctl) set ignore_enabled=? where node_id=? and " + " channel_id=? "); putSql("insertNodeChannelControlSql", "" - + "insert into $(schemaName)$(node_channel_ctl) " + + "insert into $(node_channel_ctl) " + " (node_id,channel_id,ignore_enabled,suspend_enabled) values(?,?,?,?) "); putSql("insertNodeSql", - "insert into $(schemaName)$(node) (node_group_id, external_id, database_type, database_version, schema_version, symmetric_version, sync_url," + + "insert into $(node) (node_group_id, external_id, database_type, database_version, schema_version, symmetric_version, sync_url," + "heartbeat_time, sync_enabled, timezone_offset, batch_to_send_count, batch_in_error_count, created_at_node_id, " + "deployment_type, config_version, node_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); putSql("updateNodeSql", - "update $(schemaName)$(node) set node_group_id=?, external_id=?, database_type=?, " + "update $(node) set node_group_id=?, external_id=?, database_type=?, " + " database_version=?, schema_version=?, symmetric_version=?, sync_url=?, heartbeat_time=?, " + " sync_enabled=?, timezone_offset=?, batch_to_send_count=?, batch_in_error_count=?, " + " created_at_node_id=?, deployment_type=?, config_version = ? where node_id = ?"); @@ -69,7 +69,7 @@ public NodeServiceSqlMap(IDatabasePlatform platform, Map replace + "where node_group_id = ? and sync_enabled=1 order by node_id "); putSql("findNodesWithOpenRegistrationSql", - "where node_id in (select node_id from $(schemaName)$(node_security) where registration_enabled=1) "); + "where node_id in (select node_id from $(node_security) where registration_enabled=1) "); putSql("findNodesCreatedByMeSql", "" + "where created_at_node_id=? and created_at_node_id != node_id "); @@ -79,18 +79,18 @@ public NodeServiceSqlMap(IDatabasePlatform platform, Map replace + " initial_load_enabled, initial_load_time, created_at_node_id, " + " rev_initial_load_enabled, rev_initial_load_time, initial_load_id, " + " initial_load_create_by, rev_initial_load_id, rev_initial_load_create_by " + - " from $(schemaName)$(node_security) where " + " from $(node_security) where " + " node_id = ?"); putSql("selectExternalIdsSql", - "select distinct(external_id) from $(schemaName)$(node) where sync_enabled=1 order by external_id asc "); + "select distinct(external_id) from $(node) where sync_enabled=1 order by external_id asc "); putSql("findNodeSecurityWithLoadEnabledSql", "select node_id, node_password, registration_enabled, registration_time, " + " initial_load_enabled, initial_load_time, created_at_node_id, " + " rev_initial_load_enabled, rev_initial_load_time, initial_load_id, " + " initial_load_create_by, rev_initial_load_id, rev_initial_load_create_by " - + " from $(schemaName)$(node_security) " + + " from $(node_security) " + " where initial_load_enabled=1 or rev_initial_load_enabled=1 "); putSql("findAllNodeSecuritySql", @@ -98,66 +98,66 @@ public NodeServiceSqlMap(IDatabasePlatform platform, Map replace + " initial_load_enabled, initial_load_time, created_at_node_id, " + " rev_initial_load_enabled, rev_initial_load_time, initial_load_id, " + " initial_load_create_by, rev_initial_load_id, rev_initial_load_create_by " + - " from $(schemaName)$(node_security) "); + " from $(node_security) "); - putSql("deleteNodeSecuritySql", "delete from $(schemaName)$(node_security) where node_id = ?"); + putSql("deleteNodeSecuritySql", "delete from $(node_security) where node_id = ?"); - putSql("deleteNodeSql", "delete from $(schemaName)$(node) where node_id = ?"); + putSql("deleteNodeSql", "delete from $(node) where node_id = ?"); - putSql("deleteNodeHostSql", "delete from $(schemaName)$(node_host) where node_id = ?"); + putSql("deleteNodeHostSql", "delete from $(node_host) where node_id = ?"); - putSql("deleteNodeChannelCtlSql", "delete from $(schemaName)$(node_channel_ctl) where node_id = ?"); + putSql("deleteNodeChannelCtlSql", "delete from $(node_channel_ctl) where node_id = ?"); - putSql("deleteIncomingErrorSql", "delete from $(schemaName)$(incoming_error) where node_id = ?"); + putSql("deleteIncomingErrorSql", "delete from $(incoming_error) where node_id = ?"); - putSql("deleteTableReloadRequestSql", "delete from $(schemaName)$(table_reload_request) where source_node_id = ? or target_node_id=?"); + putSql("deleteTableReloadRequestSql", "delete from $(table_reload_request) where source_node_id = ? or target_node_id=?"); - putSql("deleteExtractRequestSql", "delete from $(schemaName)$(extract_request) where node_id = ?"); + putSql("deleteExtractRequestSql", "delete from $(extract_request) where node_id = ?"); - putSql("deleteNodeCommunicationSql", "delete from $(schemaName)$(node_communication) where node_id = ?"); + putSql("deleteNodeCommunicationSql", "delete from $(node_communication) where node_id = ?"); - putSql("setOutgoingBatchOkSql", "update $(schemaName)$(outgoing_batch) set status='OK', error_flag=0 where node_id = ?"); + putSql("setOutgoingBatchOkSql", "update $(outgoing_batch) set status='OK', error_flag=0 where node_id = ?"); - putSql("deleteIncomingBatchSql", "delete from $(schemaName)$(incoming_batch) where node_id = ?"); + putSql("deleteIncomingBatchSql", "delete from $(incoming_batch) where node_id = ?"); - putSql("findNodeIdentitySql", "inner join $(schemaName)$(node_identity) i on c.node_id = " + putSql("findNodeIdentitySql", "inner join $(node_identity) i on c.node_id = " + " i.node_id "); - putSql("deleteNodeIdentitySql", "delete from $(schemaName)$(node_identity) "); + putSql("deleteNodeIdentitySql", "delete from $(node_identity) "); putSql("isNodeRegisteredSql", - "select count(*) from $(schemaName)$(node_security) s inner join " - + " $(schemaName)$(node) n on n.node_id=s.node_id where n.node_group_id=? and " + "select count(*) from $(node_security) s inner join " + + " $(node) n on n.node_id=s.node_id where n.node_group_id=? and " + " n.external_id=? and s.registration_time is not null and s.registration_enabled=0 "); putSql("findNodesWhoTargetMeSql", "" - + "inner join $(schemaName)$(node_group_link) d on " + + "inner join $(node_group_link) d on " + " c.node_group_id = d.source_node_group_id where d.target_node_group_id = ? and " - + " (d.data_event_action = ? or d.is_reversible = 1) and c.node_id not in (select node_id from $(schemaName)$(node_identity)) "); + + " (d.data_event_action = ? or d.is_reversible = 1) and c.node_id not in (select node_id from $(node_identity)) "); putSql("findNodesWhoITargetSql", "" - + "inner join $(schemaName)$(node_group_link) d on " + + "inner join $(node_group_link) d on " + " c.node_group_id = d.target_node_group_id where d.source_node_group_id = ? and " - + " (d.data_event_action = ? or d.is_reversible = 1) and c.node_id not in (select node_id from $(schemaName)$(node_identity)) "); + + " (d.data_event_action = ? or d.is_reversible = 1) and c.node_id not in (select node_id from $(node_identity)) "); putSql("selectNodeHostPrefixSql", "" + "select node_id, host_name, ip_address, os_user, os_name, os_arch, os_version, available_processors, " + " free_memory_bytes, total_memory_bytes, max_memory_bytes, java_version, java_vendor, jdbc_version, symmetric_version, " - + " timezone_offset, heartbeat_time, last_restart_time, create_time from $(schemaName)$(node_host) h"); + + " timezone_offset, heartbeat_time, last_restart_time, create_time from $(node_host) h"); putSql("selectNodeHostByNodeIdSql", "where node_id=? order by heartbeat_time desc"); putSql("selectNodePrefixSql", "select c.node_id, c.node_group_id, c.external_id, c.sync_enabled, c.sync_url, " + " c.schema_version, c.database_type, c.database_version, c.symmetric_version, c.created_at_node_id, c.heartbeat_time, c.timezone_offset, c.batch_to_send_count, c.batch_in_error_count, c.deployment_type, c.config_version from " - + " $(schemaName)$(node) c "); + + " $(node) c "); putSql("updateNodeSecuritySql", "" - + "update $(schemaName)$(node_security) set node_password = ?, registration_enabled = ?, " + + "update $(node_security) set node_password = ?, registration_enabled = ?, " + " registration_time = ?, initial_load_enabled = ?, initial_load_time = ?, created_at_node_id = ?," + " rev_initial_load_enabled=?, rev_initial_load_time=?, initial_load_id=?, " + " initial_load_create_by=?, rev_initial_load_id=?, rev_initial_load_create_by=? " + @@ -165,52 +165,52 @@ public NodeServiceSqlMap(IDatabasePlatform platform, Map replace putSql("insertNodeSecuritySql", "" - + "insert into $(schemaName)$(node_security) (node_id, node_password, created_at_node_id) values (?, ?, ?) "); + + "insert into $(node_security) (node_id, node_password, created_at_node_id) values (?, ?, ?) "); putSql("insertNodeHostSql", - "insert into $(schemaName)$(node_host) " + "insert into $(node_host) " + " (ip_address, os_user, os_name, os_arch, os_version, available_processors, free_memory_bytes, total_memory_bytes, max_memory_bytes, java_version, java_vendor, jdbc_version, symmetric_version, timezone_offset, heartbeat_time, last_restart_time, create_time, node_id, host_name) " + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, current_timestamp,?,?) "); putSql("updateNodeHostSql", "" - + "update $(schemaName)$(node_host) set " + + "update $(node_host) set " + " ip_address=?, os_user=?, os_name=?, os_arch=?, os_version=?, available_processors=?, free_memory_bytes=?, " + " total_memory_bytes=?, max_memory_bytes=?, java_version=?, java_vendor=?, jdbc_version=?, symmetric_version=?, timezone_offset=?, heartbeat_time=?, " + " last_restart_time=? where node_id=? and host_name=? "); putSql("findNodeHeartbeatsSql", - "select h.node_id, h.heartbeat_time, h.timezone_offset from $(schemaName)$(node_host) h inner join $(schemaName)$(node) n on h.node_id=n.node_id" - + " where n.sync_enabled = 1 and h.heartbeat_time = (select max(hh.heartbeat_time) from $(schemaName)$(node_host) hh where hh.node_id = h.node_id)"); + "select h.node_id, h.heartbeat_time, h.timezone_offset from $(node_host) h inner join $(node) n on h.node_id=n.node_id" + + " where n.sync_enabled = 1 and h.heartbeat_time = (select max(hh.heartbeat_time) from $(node_host) hh where hh.node_id = h.node_id)"); putSql("findNodeGroupTableInfoCountSql", - "select count(table_name) from $(schemaName)$(node_group_table_info) where node_group_id = ?"); + "select count(table_name) from $(node_group_table_info) where node_group_id = ?"); putSql("insertNodeGroupTableInfoSql", - "insert into $(schemaName)$(node_group_table_info) (node_group_id, catalog_name, schema_name, table_name," + "insert into $(node_group_table_info) (node_group_id, catalog_name, schema_name, table_name," + " default_catalog, default_schema, create_time, last_update_by, last_update_time) " + "values (?,?,?,?,?,?,?,?,?)"); putSql("selectNodeGroupTableInfoSql", "select node_group_id, catalog_name, schema_name, table_name, default_catalog, default_schema," - + "create_time, last_update_by, last_update_time from $(schemaName)$(node_group_table_info) where node_group_id = ?"); + + "create_time, last_update_by, last_update_time from $(node_group_table_info) where node_group_id = ?"); putSql("deleteNodeGroupTableInfoSql", - "delete from $(schemaName)$(node_group_table_info) where node_group_id = ? and catalog_name = ? and schema_name = ? and table_name = ? "); + "delete from $(node_group_table_info) where node_group_id = ? and catalog_name = ? and schema_name = ? and table_name = ? "); - putSql("selectCatalogsByNodeGroupTableInfoSql", "select catalog_name from $(schemaName)$(node_group_table_info) " + putSql("selectCatalogsByNodeGroupTableInfoSql", "select catalog_name from $(node_group_table_info) " + "where node_group_id = ? group by catalog_name"); - putSql("selectDefaultCatalogByNodeGroupTableInfoSql", "select catalog_name from $(schemaName)$(node_group_table_info) " + putSql("selectDefaultCatalogByNodeGroupTableInfoSql", "select catalog_name from $(node_group_table_info) " + "where node_group_id = ? and default_catalog = 1 group by catalog_name"); - putSql("selectSchemasByNodeGroupTableInfoSql", "select schema_name from $(schemaName)$(node_group_table_info) " + putSql("selectSchemasByNodeGroupTableInfoSql", "select schema_name from $(node_group_table_info) " + "where node_group_id = ? and catalog_name = ? group by schema_name"); - putSql("selectDefaultSchemaByNodeGroupTableInfoSql", "select schema_name from $(schemaName)$(node_group_table_info) " + putSql("selectDefaultSchemaByNodeGroupTableInfoSql", "select schema_name from $(node_group_table_info) " + "where node_group_id = ? and catalog_name = ? and default_schema = 1 group by schema_name"); - putSql("selectTablesByNodeGroupTableInfoSql", "select table_name from $(schemaName)$(node_group_table_info) " + putSql("selectTablesByNodeGroupTableInfoSql", "select table_name from $(node_group_table_info) " + "where node_group_id = ? and catalog_name = ? and schema_name = ? "); } 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 490b8f4ca7..082886f71c 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 @@ -30,32 +30,32 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, Map replacementTokens) { super(platform, replacementTokens); - putSql("selectNodesInErrorSql", "select distinct node_id from $(schemaName)$(outgoing_batch) where error_flag=1"); + putSql("selectNodesInErrorSql", "select distinct node_id from $(outgoing_batch) where error_flag=1"); putSql("initialLoadStatusSql", - "select status from $(schemaName)$(outgoing_batch) where node_id=? and load_flag=? "); + "select status from $(outgoing_batch) where node_id=? and load_flag=? "); putSql("unsentBatchesForNodeIdChannelIdSql", - "select count(*) from $(schemaName)$(outgoing_batch) where node_id=? and channel_id=? and status != 'OK' "); + "select count(*) from $(outgoing_batch) where node_id=? and channel_id=? and status != 'OK' "); - putSql("selectCountBatchesPrefixSql", "select count(*) from $(schemaName)$(outgoing_batch) "); + putSql("selectCountBatchesPrefixSql", "select count(*) from $(outgoing_batch) "); putSql("cancelLoadBatchesSql", - "update $(schemaName)$(outgoing_batch) set ignore_count=1, status='OK', error_flag=0, last_update_time=current_timestamp 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 $(schemaName)$(outgoing_batch) set ignore_count=1, status='OK', error_flag=0 where channel_id=? and status != 'OK'"); + "update $(outgoing_batch) set ignore_count=1, status='OK', error_flag=0 where channel_id=? and status != 'OK'"); putSql("cancelChannelBatchesTableSql", " and summary=?"); putSql("insertOutgoingBatchSql", - "insert into $(schemaName)$(outgoing_batch) " + "insert into $(outgoing_batch) " + " (batch_id, node_id, channel_id, status, load_id, extract_job_flag, load_flag, common_flag, reload_row_count, other_row_count, " + " data_update_row_count, data_insert_row_count, data_delete_row_count, last_update_hostname, last_update_time, create_time, create_by, summary) " + " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, current_timestamp, current_timestamp, ?, ?) "); putSql("updateOutgoingBatchSql", - "update $(schemaName)$(outgoing_batch) set status=?, load_id=?, extract_job_flag=?, load_flag=?, error_flag=?, " + "update $(outgoing_batch) set status=?, load_id=?, extract_job_flag=?, load_flag=?, error_flag=?, " + " byte_count=?, extract_count=?, sent_count=?, load_count=?, data_row_count=?, " + " reload_row_count=?, data_insert_row_count=?, data_update_row_count=?, data_delete_row_count=?, other_row_count=?, " + " ignore_count=?, router_millis=?, network_millis=?, filter_millis=?, " @@ -75,15 +75,15 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, "where node_id = ? and status in (?, ?, ?, ?, ?, ?, ?, ?) order by batch_id asc "); putSql("selectOutgoingBatchChannelSql", - " join $(schemaName)$(channel) c on c.channel_id = b.channel_id where node_id = ? and c.queue = ? and status in (?, ?, ?, ?, ?, ?, ?, ?) order by batch_id asc "); + " join $(channel) c on c.channel_id = b.channel_id where node_id = ? and c.queue = ? and status in (?, ?, ?, ?, ?, ?, ?, ?) order by batch_id asc "); putSql("selectOutgoingBatchChannelActionSql", - " join $(schemaName)$(channel) c on c.channel_id = b.channel_id" + + " join $(channel) c on c.channel_id = b.channel_id" + " where c.data_event_action = ?" + " and b.node_id = ? and c.queue = ? and b.status in (?, ?, ?, ?, ?, ?, ?, ?) order by b.batch_id asc "); putSql("selectOutgoingBatchChannelActionNullSql", - " join $(schemaName)$(channel) c on c.channel_id = b.channel_id" + + " join $(channel) c on c.channel_id = b.channel_id" + " where (c.data_event_action is null or c.data_event_action = ?)" + " and b.node_id = ? and c.queue = ? and b.status in (?, ?, ?, ?, ?, ?, ?, ?) order by b.batch_id asc "); @@ -108,39 +108,39 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, + " b.ignore_row_count, b.missing_delete_count, b.skip_count, " + " b.failed_data_id, b.last_update_hostname, b.last_update_time, b.create_time, b.batch_id, b.extract_job_flag, " + " b.load_flag, b.error_flag, b.common_flag, b.load_id, b.create_by, b.summary from " - + " $(schemaName)$(outgoing_batch) b "); + + " $(outgoing_batch) b "); putSql("selectOutgoingBatchErrorsSql", " where error_flag=1 order by batch_id "); putSql("countOutgoingBatchesErrorsOnChannelSql", - "select count(*) from $(schemaName)$(outgoing_batch) where error_flag=1 and channel_id=?"); + "select count(*) from $(outgoing_batch) where error_flag=1 and channel_id=?"); putSql("countOutgoingBatchesByChannelSql", - "select count(*) as batch_count, channel_id from $(schemaName)$(outgoing_batch) where node_id = ? and channel_id <> 'heartbeat' and status in ('ER','RQ','NE','QY','RT') group by channel_id order by batch_count desc, channel_id"); + "select count(*) as batch_count, channel_id from $(outgoing_batch) where node_id = ? and channel_id <> 'heartbeat' and status in ('ER','RQ','NE','QY','RT') group by channel_id order by batch_count desc, channel_id"); putSql("countOutgoingRowsByTargetNodeSql", - "select sum(data_row_count) as row_count from $(schemaName)$(outgoing_batch) where node_id = ? and channel_id <> 'heartbeat' and status in ('ER','RQ','NE','QY','RT')"); + "select sum(data_row_count) as row_count from $(outgoing_batch) where node_id = ? and channel_id <> 'heartbeat' and status in ('ER','RQ','NE','QY','RT')"); putSql("countOutgoingBatchesByTargetNodeSql", - "select count(*) as row_count from $(schemaName)$(outgoing_batch) where node_id = ? and channel_id <> 'heartbeat' and status in ('ER','RQ','NE','QY','RT')"); + "select count(*) as row_count from $(outgoing_batch) where node_id = ? and channel_id <> 'heartbeat' and status in ('ER','RQ','NE','QY','RT')"); putSql("countOutgoingBatchesErrorsSql", - "select count(*) from $(schemaName)$(outgoing_batch) where error_flag=1"); + "select count(*) from $(outgoing_batch) where error_flag=1"); putSql("countOutgoingBatchesUnsentSql", - "select count(*) from $(schemaName)$(outgoing_batch) where status != 'OK'"); + "select count(*) from $(outgoing_batch) where status != 'OK'"); putSql("countOutgoingBatchesWithStatusSql", - "select count(*) from $(schemaName)$(outgoing_batch) where status = ? "); + "select count(*) from $(outgoing_batch) where status = ? "); putSql("countOutgoingBatchesUnsentOnChannelSql", - "select count(*) from $(schemaName)$(outgoing_batch) where status != 'OK' and channel_id=?"); + "select count(*) from $(outgoing_batch) where status != 'OK' and channel_id=?"); putSql("selectOutgoingBatchSummaryByStatusSql", "select count(*) as batches, sum(data_row_count) as data, status, node_id, min(create_time) as oldest_batch_time, " + " max(last_update_time) as last_update_time, sum(byte_count) as total_bytes, " + " sum(router_millis + extract_millis + network_millis + filter_millis + load_millis) as total_millis " - + " from $(schemaName)$(outgoing_batch) where status in (:STATUS_LIST) group by status, node_id order by oldest_batch_time asc "); + + " from $(outgoing_batch) where status in (:STATUS_LIST) group by status, node_id order by oldest_batch_time asc "); putSql("selectOutgoingBatchSummaryByStatusAndChannelSql", "select count(*) as batches, sum(s.data_row_count) as data, s.status, s.node_id, min(s.create_time) as oldest_batch_time, s.channel_id, " @@ -149,19 +149,19 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, + " sum(s.router_millis) as total_router_millis, sum(s.extract_millis) as total_extract_millis, " + " sum(s.network_millis) as total_network_millis, sum(s.filter_millis) as total_filter_millis, " + " sum(s.load_millis) as total_load_millis " - + " from $(schemaName)$(outgoing_batch) s join $(schemaName)$(outgoing_batch) b on b.batch_id=s.batch_id and b.node_id=s.node_id join" - + " $(schemaName)$(node) n on n.node_id=s.node_id and n.sync_enabled=1" + + " from $(outgoing_batch) s join $(outgoing_batch) b on b.batch_id=s.batch_id and b.node_id=s.node_id join" + + " $(node) n on n.node_id=s.node_id and n.sync_enabled=1" + " where s.status in (:STATUS_LIST) group by s.status, s.node_id, s.channel_id, b.sql_message order by s.node_id, oldest_batch_time asc "); putSql("updateOutgoingBatchesStatusSql", - "update $(schemaName)$(outgoing_batch) set status=? where status = ? "); + "update $(outgoing_batch) set status=? where status = ? "); putSql("getLoadSummariesSql", "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_row_count) as current_data_event_count, b.channel_id " - + "from $(schemaName)$(outgoing_batch) b " - + " join $(schemaName)$(channel) c on c.channel_id = b.channel_id " + + "from $(outgoing_batch) b " + + " join $(channel) c on c.channel_id = b.channel_id " + "where c.reload_flag = 1 " + " and b.load_id > 0 " + "group by b.load_id, b.node_id, b.status, b.channel_id, b.create_by " @@ -169,8 +169,8 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, putSql("getActiveLoadsSql", "select r.load_id " - + "from $(schemaName)$(table_reload_request) r " - + "join $(schemaName)$(outgoing_batch) ob on ob.load_id = r.load_id " + + "from $(table_reload_request) r " + + "join $(outgoing_batch) ob on ob.load_id = r.load_id " + "where ob.status != 'OK' and ob.status != 'IG' and r.source_node_id = ? " + "group by r.load_id"); @@ -180,7 +180,7 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, + " max(create_table) as create_table, max(delete_first) as delete_first, max(processed) as processed, " + " max(reload_select) as reload_select, max(before_custom_sql) as before_custom_sql, " + " max(last_update_by) as last_update_by, min(last_update_time) as last_update_time " - + "from $(schemaName)$(table_reload_request) r " + + "from $(table_reload_request) r " + "where processed = 0 and source_node_id = ? " + "group by r.source_node_id, r.target_node_id"); @@ -190,23 +190,23 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, + " max(create_table) as create_table, max(delete_first) as delete_first, max(processed) as processed, " //+ " max(reload_select) as reload_select, max(before_custom_sql) as before_custom_sql, " + " max(last_update_by) as last_update_by, min(last_update_time) as last_update_time " - + "from $(schemaName)$(table_reload_request) " + + "from $(table_reload_request) " + " where load_id = ? " + " group by load_id, target_node_id "); putSql("getLoadOverviewSql", "select status, count(batch_id) as count " - + " from $(schemaName)$(outgoing_batch) " + + " from $(outgoing_batch) " + " where load_id = ?" + " group by status"); putSql("getLoadHistorySql", "select r.load_id, max(trigger_id) as trigger_id, count(trigger_id) as table_count, max(target_node_id) as target_node_id, " + "create_time, o.last_update_time, min_table, max_table " - + "from $(schemaName)$(table_reload_request) r " + + "from $(table_reload_request) r " + "join ( " + " select load_id, max(last_update_time) as last_update_time, min(summary) as min_table, max(summary) as max_table " - + " from $(schemaName)$(outgoing_batch) " + + " from $(outgoing_batch) " + " group by load_id " + ") o on o.load_id = r.load_id " + "where source_node_id = ? " @@ -224,30 +224,30 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, + " sum(extract_millis + transform_extract_millis) as full_extract_millis, " + " sum(network_millis) as full_transfer_millis, " + " sum(load_millis + transform_load_millis + filter_millis) as full_load_millis " - + " from $(schemaName)$(outgoing_batch) ob " - + " join $(schemaName)$(channel) c on c.channel_id = ob.channel_id " + + " from $(outgoing_batch) ob " + + " join $(channel) c on c.channel_id = ob.channel_id " + " where ob.load_id = ? " + " group by ob.load_id, c.queue, ob.status" + " order by ob.load_id asc"); putSql("getNextOutgoingBatchForEachNodeSql", "select min(b.batch_id) as batch_id, b.node_id, b.status, b.channel_id " - + " from $(schemaName)$(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", - "delete from $(schemaName)$(outgoing_batch) where node_id=? and channel_id=? and batch_id < " - + "(select max(batch_id) from $(schemaName)$(outgoing_batch) where node_id=? and channel_id=?) "); + "delete from $(outgoing_batch) where node_id=? and channel_id=? and batch_id < " + + "(select max(batch_id) from $(outgoing_batch) where node_id=? and channel_id=?) "); putSql("copyOutgoingBatchesSql", - "insert into $(schemaName)$(outgoing_batch) " + "insert into $(outgoing_batch) " + " (batch_id, node_id, channel_id, status, load_id, extract_job_flag, load_flag, common_flag, reload_row_count, other_row_count, " + " last_update_hostname, last_update_time, create_time, create_by) " + " (select batch_id, ?, channel_id, 'NE', load_id, extract_job_flag, load_flag, common_flag, reload_row_count, other_row_count, " - + " last_update_hostname, current_timestamp, create_time, 'copy' from $(schemaName)$(outgoing_batch) where node_id=? and channel_id=? and batch_id > ?) "); + + " last_update_hostname, current_timestamp, create_time, 'copy' from $(outgoing_batch) where node_id=? and channel_id=? and batch_id > ?) "); - putSql("getAllBatchesSql", "select batch_id from $(schemaName)$(outgoing_batch)"); + putSql("getAllBatchesSql", "select batch_id from $(outgoing_batch)"); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterServiceSqlMap.java index 79fe38cf9a..ae98227cda 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterServiceSqlMap.java @@ -30,36 +30,36 @@ public ParameterServiceSqlMap(IDatabasePlatform platform, Map re super(platform, replacementTokens); putSql("updateParameterSql" ,"" + -"update $(schemaName)$(parameter) set param_value=?, last_update_by=?, last_update_time=current_timestamp " + +"update $(parameter) set param_value=?, last_update_by=?, last_update_time=current_timestamp " + " where external_id=? and node_group_id=? and param_key=?" ); putSql("insertParameterSql" ,"" + -"insert into $(schemaName)$(parameter) (external_id, node_group_id, param_key, param_value, last_update_by, create_time, last_update_time) " + +"insert into $(parameter) (external_id, node_group_id, param_key, param_value, last_update_by, create_time, last_update_time) " + " values(?, ?, ?, ?, ?, current_timestamp, current_timestamp) " ); putSql("selectParametersSql" ,"" + -"select param_key, param_value from $(schemaName)$(parameter) where external_id=? and " + +"select param_key, param_value from $(parameter) where external_id=? and " + " node_group_id=? " ); putSql("selectParametersByNodeGroupIdSql" ,"" + -"select param_key, param_value from $(schemaName)$(parameter) where " + +"select param_key, param_value from $(parameter) where " + " node_group_id=? " ); putSql("selectParametersByExternalIdSql" ,"" + -"select param_key, param_value from $(schemaName)$(parameter) where external_id=? " ); +"select param_key, param_value from $(parameter) where external_id=? " ); putSql("selectParametersByKeySql" ,"" + -"select param_key, param_value, external_id, node_group_id from $(schemaName)$(parameter) where param_key=? " + +"select param_key, param_value, external_id, node_group_id from $(parameter) where param_key=? " + " order by node_group_id, external_id " ); putSql("deleteParameterSql" ,"" + -"delete from $(schemaName)$(parameter) where external_id=? and " + +"delete from $(parameter) where external_id=? and " + " node_group_id=? and param_key=? " ); - putSql("deleteParameterByKeySql", "delete from $(schemaName)$(parameter) where param_key=?" ); + putSql("deleteParameterByKeySql", "delete from $(parameter) where param_key=?" ); putSql("selectMaxLastUpdateTime" ,"" + -"select max(last_update_time) from $(schemaName)$(parameter) where last_update_time is not null" ); +"select max(last_update_time) from $(parameter) where last_update_time is not null" ); } 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 b68d0463ec..ef31d5951f 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 @@ -31,98 +31,98 @@ public PurgeServiceSqlMap(IDatabasePlatform platform, Map replac // @formatter:off - putSql("minDataGapStartId", "select min(start_id) from $(schemaName)$(data_gap)"); + putSql("minDataGapStartId", "select min(start_id) from $(data_gap)"); - putSql("deleteExtractRequestSql", "delete from $(schemaName)$(extract_request) where status=? and last_update_time < ? and " - + "0 = (select count(1) from $(schemaName)$(outgoing_batch) where status != 'OK' and batch_id between $(schemaName)$(extract_request).start_batch_id and $(schemaName)$(extract_request).end_batch_id)"); + putSql("deleteExtractRequestSql", "delete from $(extract_request) where status=? and last_update_time < ? and " + + "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 $(schemaName)$(registration_request) where status in (?,?,?) and last_update_time < ?"); + putSql("deleteRegistrationRequestSql", "delete from $(registration_request) where status in (?,?,?) and last_update_time < ?"); - putSql("deleteMonitorEventSql", "delete from $(schemaName)$(monitor_event) where event_time < ?"); + putSql("deleteMonitorEventSql", "delete from $(monitor_event) where event_time < ?"); putSql("selectOutgoingBatchRangeSql" , -"select min(batch_id) as min_id, max(batch_id) as max_id from $(schemaName)$(outgoing_batch) where " + -" create_time < ? and status = ? and batch_id < (select max(batch_id) from $(schemaName)$(outgoing_batch)) " ); +"select min(batch_id) as min_id, max(batch_id) as max_id from $(outgoing_batch) where " + +" create_time < ? and status = ? and batch_id < (select max(batch_id) from $(outgoing_batch)) " ); putSql("deleteOutgoingBatchSql" , -"delete from $(schemaName)$(outgoing_batch) where status = ? and batch_id between ? " + -" and ? and batch_id not in (select batch_id from $(schemaName)$(data_event) where batch_id between ? " + +"delete from $(outgoing_batch) where status = ? and batch_id between ? " + +" and ? and batch_id not in (select batch_id from $(data_event) where batch_id between ? " + " and ?) " ); putSql("deleteDataEventSql" , -"delete from $(schemaName)$(data_event) where batch_id not in (select batch_id from " + -" $(schemaName)$(outgoing_batch) where batch_id between ? and ? and status != ?) " + +"delete from $(data_event) where batch_id not in (select batch_id from " + +" $(outgoing_batch) where batch_id between ? and ? and status != ?) " + " and batch_id between ? and ? " ); putSql("selectDataRangeSql" , -"select min(data_id) as min_id, max(data_id) as max_id from $(schemaName)$(data) where data_id < (select max(data_id) from $(schemaName)$(data)) " ); +"select min(data_id) as min_id, max(data_id) as max_id from $(data) where data_id < (select max(data_id) from $(data)) " ); putSql("updateStrandedBatches" , -"update $(schemaName)$(outgoing_batch) set status=? where node_id not " + -" in (select node_id from $(schemaName)$(node) where sync_enabled=?) and status != ? " ); +"update $(outgoing_batch) set status=? where node_id not " + +" in (select node_id from $(node) where sync_enabled=?) and status != ? " ); putSql("deleteStrandedData" , -"delete from $(schemaName)$(data) where " + +"delete from $(data) where " + " data_id between ? and ? and " + " data_id < ? and " + " create_time < ? and " + -" data_id not in (select e.data_id from $(schemaName)$(data_event) e where " + +" data_id not in (select e.data_id from $(data_event) e where " + " e.data_id between ? and ?) " ); putSql("deleteDataSql" , -"delete from $(schemaName)$(data) where " + +"delete from $(data) where " + " data_id between ? and ? and " + " create_time < ? and " + -" data_id in (select e.data_id from $(schemaName)$(data_event) e where " + +" data_id in (select e.data_id from $(data_event) e where " + " e.data_id between ? and ?) " + " and " + " data_id not in " + -" (select e.data_id from $(schemaName)$(data_event) e where " + +" (select e.data_id from $(data_event) e where " + " e.data_id between ? and ? and " + " (e.data_id is null or " + " e.batch_id in " + -" (select batch_id from $(schemaName)$(outgoing_batch) where " + +" (select batch_id from $(outgoing_batch) where " + " status != ?))) " ); putSql("selectIncomingBatchRangeSql" , -"select node_id, min(batch_id) as min_id, max(batch_id) as max_id from $(schemaName)$(incoming_batch) where " + +"select node_id, min(batch_id) as min_id, max(batch_id) as max_id from $(incoming_batch) where " + " create_time < ? and status = ? group by node_id " ); putSql("deleteIncomingBatchSql" , -"delete from $(schemaName)$(incoming_batch) where batch_id between ? and ? and node_id = ? and status = ?" ); +"delete from $(incoming_batch) where batch_id between ? and ? and node_id = ? and status = ?" ); - putSql("deleteIncomingErrorsSql", "delete from $(schemaName)$(incoming_error) where batch_id not in (select batch_id from $(schemaName)$(incoming_batch))"); + putSql("deleteIncomingErrorsSql", "delete from $(incoming_error) where batch_id not in (select batch_id from $(incoming_batch))"); putSql("deleteFromDataGapsSql" , -"delete from $(schemaName)$(data_gap) where last_update_time < ? and status != ?" ); +"delete from $(data_gap) where last_update_time < ? and status != ?" ); putSql("deleteIncomingBatchByNodeSql" , -"delete from $(schemaName)$(incoming_batch) where node_id = ? " ); +"delete from $(incoming_batch) where node_id = ? " ); - putSql("purgeNodeHostChannelStatsSql", "delete from $(schemaName)$(node_host_channel_stats) where start_time < ?"); + putSql("purgeNodeHostChannelStatsSql", "delete from $(node_host_channel_stats) where start_time < ?"); - putSql("purgeNodeHostStatsSql", "delete from $(schemaName)$(node_host_stats) where start_time < ?"); + putSql("purgeNodeHostStatsSql", "delete from $(node_host_stats) where start_time < ?"); - putSql("purgeNodeHostJobStatsSql", "delete from $(schemaName)$(node_host_job_stats) where start_time < ?"); + putSql("purgeNodeHostJobStatsSql", "delete from $(node_host_job_stats) where start_time < ?"); - putSql("selectIncomingErrorsBatchIdsSql", "select distinct e.batch_id as batch_id from $(schemaName)$(incoming_error) e LEFT OUTER JOIN $(schemaName)$(incoming_batch) i ON e.batch_id = i.batch_id where i.batch_id IS NULL"); + putSql("selectIncomingErrorsBatchIdsSql", "select distinct e.batch_id as batch_id from $(incoming_error) e LEFT OUTER JOIN $(incoming_batch) i ON e.batch_id = i.batch_id where i.batch_id IS NULL"); - putSql("deleteIncomingErrorsBatchIdsSql", "delete from $(schemaName)$(incoming_error) where batch_id IN (?)"); + putSql("deleteIncomingErrorsBatchIdsSql", "delete from $(incoming_error) where batch_id IN (?)"); - putSql("deleteOutgoingBatchByCreateTimeSql", "delete from $(schemaName)$(outgoing_batch) where create_time < ?"); - putSql("deleteDataEventByCreateTimeSql", "delete from $(schemaName)$(data_event) where create_time < ?"); - putSql("deleteDataByCreateTimeSql", "delete from $(schemaName)$(data) where create_time < ?"); - putSql("deleteExtractRequestByCreateTimeSql", "delete from $(schemaName)$(extract_request) where create_time < ?"); + putSql("deleteOutgoingBatchByCreateTimeSql", "delete from $(outgoing_batch) where create_time < ?"); + putSql("deleteDataEventByCreateTimeSql", "delete from $(data_event) where create_time < ?"); + putSql("deleteDataByCreateTimeSql", "delete from $(data) where create_time < ?"); + putSql("deleteExtractRequestByCreateTimeSql", "delete from $(extract_request) where create_time < ?"); putSql("selectStrandedDataEventRangeSql" , -"select min(data_id) as min_id, max(data_id) as max_id from $(schemaName)$(data_event) " + -"where batch_id not in (select batch_id from $(schemaName)$(outgoing_batch))"); +"select min(data_id) as min_id, max(data_id) as max_id from $(data_event) " + +"where batch_id not in (select batch_id from $(outgoing_batch))"); putSql("deleteStrandedDataEvent", -"delete from $(schemaName)$(data_event) " + +"delete from $(data_event) " + "where data_id between ? and ? " + "and create_time < ? " + -"and batch_id not in (select batch_id from $(schemaName)$(outgoing_batch))"); +"and batch_id not in (select batch_id from $(outgoing_batch))"); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationServiceSqlMap.java index 691198edc8..8b0df0ddb7 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationServiceSqlMap.java @@ -32,43 +32,43 @@ public RegistrationServiceSqlMap(IDatabasePlatform platform, putSql("findNodeToRegisterSql", "" - + "select min(c.node_id) from $(schemaName)$(node) c inner join " - + " $(schemaName)$(node_security) s on c.node_id = s.node_id where s.registration_enabled = " + + "select min(c.node_id) from $(node) c inner join " + + " $(node_security) s on c.node_id = s.node_id where s.registration_enabled = " + " 1 and c.node_group_id = ? and c.external_id = ? "); putSql("registerNodeSecuritySql", "" - + "update $(schemaName)$(node_security) set registration_enabled = 0, registration_time = " + + "update $(node_security) set registration_enabled = 0, registration_time = " + " current_timestamp where node_id = ? "); putSql("reopenRegistrationSql", "" - + "update $(schemaName)$(node_security) set node_password = ?, registration_enabled = 1, " + + "update $(node_security) set node_password = ?, registration_enabled = 1, " + " registration_time = null where node_id = ? and registration_enabled = 0 "); putSql("openRegistrationNodeSecuritySql", "" - + "insert into $(schemaName)$(node_security) (node_id, node_password, " + + "insert into $(node_security) (node_id, node_password, " + " registration_enabled, created_at_node_id) values (?, ?, 1, ?) "); putSql("getRegistrationRedirectUrlSql", "" - + "select sync_url from $(schemaName)$(node) n inner join $(schemaName)$(registration_redirect) r " + + "select sync_url from $(node) n inner join $(registration_redirect) r " + "on n.node_id=r.registration_node_id where r.registrant_external_id=? "); - putSql("insertRegistrationRedirectUrlSql", "" + "insert into $(schemaName)$(registration_redirect) " + putSql("insertRegistrationRedirectUrlSql", "" + "insert into $(registration_redirect) " + "(registration_node_id, registrant_external_id) values (?, ?) "); - putSql("updateRegistrationRedirectUrlSql", "" + "update $(schemaName)$(registration_redirect) " + putSql("updateRegistrationRedirectUrlSql", "" + "update $(registration_redirect) " + "set registration_node_id=? where registrant_external_id=? "); putSql("insertRegistrationRequestSql", "" - + "insert into $(schemaName)$(registration_request) " + + "insert into $(registration_request) " + " (last_update_by, last_update_time, attempt_count, registered_node_id, status, " + " node_group_id, external_id, ip_address, host_name, error_message, create_time) " + " values (?,?,1,?,?,?,?,?,?,?,current_timestamp) "); putSql("updateRegistrationRequestSql", "" - + "update $(schemaName)$(registration_request) " + + "update $(registration_request) " + " set attempt_count=?, " + " last_update_by=?, last_update_time=?, registered_node_id=?, status=?, error_message=? " + " where " @@ -78,11 +78,11 @@ public RegistrationServiceSqlMap(IDatabasePlatform platform, "" + "select node_group_id, external_id, status, host_name, ip_address, error_message, " + " attempt_count, registered_node_id, create_time, last_update_by, last_update_time " - + " from $(schemaName)$(registration_request) " + + " from $(registration_request) " + " where status in ('RQ','ER') "); putSql("deleteRegistrationRequestSql", - "delete from $(schemaName)$(registration_request) where node_group_id=? and external_id=? and ip_address=? and host_name=? and status=?"); + "delete from $(registration_request) where node_group_id=? and external_id=? and ip_address=? and host_name=? and status=?"); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterServiceSqlMap.java index b7a01189f2..ca5e818cee 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterServiceSqlMap.java @@ -29,41 +29,41 @@ public class RouterServiceSqlMap extends AbstractSqlMap { public RouterServiceSqlMap(IDatabasePlatform platform, Map replacementTokens) { super(platform, replacementTokens); - putSql("selectChannelsUsingGapsSql", "select distinct channel_id from $(schemaName)$(data) where $(dataRange)"); + putSql("selectChannelsUsingGapsSql", "select distinct channel_id from $(data) where $(dataRange)"); - putSql("selectChannelsUsingStartDataId", "select distinct channel_id from $(schemaName)$(data) where data_id >= ?"); + putSql("selectChannelsUsingStartDataId", "select distinct channel_id from $(data) where data_id >= ?"); putSql("selectDataUsingGapsSql", "" + "select $(selectDataUsingGapsSqlHint) d.data_id, d.table_name, d.event_type, d.row_data as row_data, d.pk_data as pk_data, d.old_data as old_data, " + " d.create_time, d.trigger_hist_id, d.channel_id, d.transaction_id, d.source_node_id, d.external_data, d.node_list " - + " from $(schemaName)$(data) d where d.channel_id=? $(dataRange) "); + + " from $(data) d where d.channel_id=? $(dataRange) "); putSql("selectDataUsingStartDataId", "" + "select d.data_id, d.table_name, d.event_type, d.row_data as row_data, d.pk_data as pk_data, d.old_data as old_data, " + " d.create_time, d.trigger_hist_id, d.channel_id, d.transaction_id, d.source_node_id, d.external_data, d.node_list " - + " from $(schemaName)$(data) d where d.channel_id=? and data_id >= ? "); + + " from $(data) d where d.channel_id=? and data_id >= ? "); putSql("orderByDataId", " order by d.data_id asc "); putSql("selectDistinctDataIdFromDataEventSql", "" - + "select distinct(data_id) from $(schemaName)$(data_event) where data_id > ? order by data_id asc "); + + "select distinct(data_id) from $(data_event) where data_id > ? order by data_id asc "); putSql("selectDistinctDataIdFromDataEventUsingGapsSql", "" - + "select distinct(data_id) from $(schemaName)$(data_event) where data_id >=? and data_id <= ? order by data_id asc "); + + "select distinct(data_id) from $(data_event) where data_id >=? and data_id <= ? order by data_id asc "); putSql("selectDataIdFromDataSql", - "select data_id from $(schemaName)$(data) where $(dataRange) order by data_id asc"); + "select data_id from $(data) where $(dataRange) order by data_id asc"); putSql("selectUnroutedCountForChannelSql", "" - + "select count(*) from $(schemaName)$(data) where channel_id=? and data_id >=? "); + + "select count(*) from $(data) where channel_id=? and data_id >=? "); putSql("selectLastDataIdRoutedUsingDataGapSql", "" - + "select max(start_id) from $(schemaName)$(data_gap) "); + + "select max(start_id) from $(data_gap) "); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SequenceServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SequenceServiceSqlMap.java index fde4fc5dfc..3f39598b9d 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SequenceServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SequenceServiceSqlMap.java @@ -32,30 +32,30 @@ public SequenceServiceSqlMap(IDatabasePlatform platform, Map rep // @formatter:off putSql("getSequenceSql", "select sequence_name,current_value,increment_by,min_value,max_value, " + - "cycle_flag,cache_size,create_time,last_update_by,last_update_time from $(schemaName)$(sequence) where sequence_name=?"); + "cycle_flag,cache_size,create_time,last_update_by,last_update_time from $(sequence) where sequence_name=?"); putSql("getAllSequenceSql", "select sequence_name,current_value,increment_by,min_value,max_value," + - "cycle_flag,cache_size,create_time,last_update_by,last_update_time from $(schemaName)$(sequence)"); + "cycle_flag,cache_size,create_time,last_update_by,last_update_time from $(sequence)"); putSql("getCurrentValueSql", - "select current_value from $(schemaName)$(sequence) where sequence_name=?"); + "select current_value from $(sequence) where sequence_name=?"); putSql("updateCurrentValueSql", - "update $(schemaName)$(sequence) set current_value=?, last_update_time=current_timestamp " + + "update $(sequence) set current_value=?, last_update_time=current_timestamp " + " where sequence_name=? and current_value=? "); putSql("insertSequenceSql", - "insert into $(schemaName)$(sequence) " + + "insert into $(sequence) " + " (sequence_name, current_value, increment_by, min_value, max_value, " + " cycle_flag, cache_size, create_time, last_update_by, last_update_time) " + " values(?,?,?,?,?,?,?,current_timestamp,?,current_timestamp) "); - putSql("maxOutgoingBatchSql", "select max(batch_id)+1 from $(schemaName)$(outgoing_batch)"); + putSql("maxOutgoingBatchSql", "select max(batch_id)+1 from $(outgoing_batch)"); - putSql("maxTriggerHistSql", "select max(trigger_hist_id)+1 from $(schemaName)$(trigger_hist)"); + putSql("maxTriggerHistSql", "select max(trigger_hist_id)+1 from $(trigger_hist)"); - putSql("maxExtractRequestSql", "select max(request_id)+1 from $(schemaName)$(extract_request)"); + putSql("maxExtractRequestSql", "select max(request_id)+1 from $(extract_request)"); // @formatter:on diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/StatisticServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/StatisticServiceSqlMap.java index 06e05ccc10..cc6a03c3d7 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/StatisticServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/StatisticServiceSqlMap.java @@ -30,7 +30,7 @@ public StatisticServiceSqlMap(IDatabasePlatform platform, Map re super(platform, replacementTokens); putSql("insertChannelStatsSql" ,"" + -"insert into $(schemaName)$(node_host_channel_stats) " + +"insert into $(node_host_channel_stats) " + " (node_id, host_name, channel_id, start_time, end_time, " + " data_routed, data_unrouted, data_event_inserted, " + " data_extracted, data_bytes_extracted, data_extracted_errors, " + @@ -44,7 +44,7 @@ public StatisticServiceSqlMap(IDatabasePlatform platform, Map re " data_extracted, data_bytes_extracted, data_extracted_errors, " + " data_sent, data_bytes_sent, data_sent_errors, " + " data_loaded, data_bytes_loaded, data_loaded_errors " + -" from $(schemaName)$(node_host_channel_stats) " + +" from $(node_host_channel_stats) " + " where start_time >= ? and end_time <= ? and node_id=? order by start_time asc " ); putSql("selectNodeStatsSql", "" + @@ -56,7 +56,7 @@ public StatisticServiceSqlMap(IDatabasePlatform platform, Map re " sum(data_bytes_sent) as data_bytes_sent, sum(data_sent_errors) as data_sent_errors, " + " sum(data_loaded) as data_loaded, sum(data_bytes_loaded) as data_bytes_loaded, " + " sum(data_loaded_errors) as data_loaded_errors " + -" from $(schemaName)$(node_host_channel_stats) " + +" from $(node_host_channel_stats) " + " where start_time >= ? and end_time <= ? and node_id=? " + " and channel_id not in ('heartbeat', 'config') " + " group by node_id, start_time, end_time " + @@ -64,12 +64,12 @@ public StatisticServiceSqlMap(IDatabasePlatform platform, Map re putSql("minNodeStatsTimeSql", "" + "select min(start_time) " + -" from $(schemaName)$(node_host_channel_stats) " + +" from $(node_host_channel_stats) " + " where node_id=? " + " and channel_id not in ('heartbeat', 'config') "); putSql("insertHostStatsSql" ,"" + -"insert into $(schemaName)$(node_host_stats) " + +"insert into $(node_host_stats) " + " (node_id, host_name, start_time, end_time, " + " restarted,nodes_pulled,nodes_pushed,nodes_rejected, " + " nodes_registered,nodes_loaded,nodes_disabled,purged_data_rows, " + @@ -86,11 +86,11 @@ public StatisticServiceSqlMap(IDatabasePlatform platform, Map re " purged_data_event_rows,purged_batch_outgoing_rows,purged_batch_incoming_rows, " + " triggers_created_count,triggers_rebuilt_count,triggers_removed_count, " + " total_nodes_pull_time, total_nodes_push_time " + -" from $(schemaName)$(node_host_stats) " + +" from $(node_host_stats) " + " where start_time >= ? and end_time <= ? and node_id=? order by start_time asc " ); putSql("insertJobStatsSql" ,"" + -"insert into $(schemaName)$(node_host_job_stats) " + +"insert into $(node_host_job_stats) " + " (node_id, host_name, job_name, start_time, end_time, " + " processed_count, target_node_id, target_node_count) " + " values(?,?,?,?,?,?,?,?) " ); @@ -98,7 +98,7 @@ public StatisticServiceSqlMap(IDatabasePlatform platform, Map re putSql("selectJobStatsSql" ,"" + "select node_id, host_name, job_name, start_time, end_time, " + " processed_count " + -" from $(schemaName)$(node_host_job_stats) " + +" from $(node_host_job_stats) " + " where start_time >= ? and end_time <= ? and node_id=? order by start_time asc " ); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformServiceSqlMap.java index aa5e743d9b..84656095ad 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformServiceSqlMap.java @@ -41,7 +41,7 @@ public TransformServiceSqlMap(IDatabasePlatform platform, Map re " update_first, update_action, delete_action, column_policy, " + " last_update_time, last_update_by, create_time " + " from " + -" $(schemaName)$(transform_table) order by transform_order " + +" $(transform_table) order by transform_order " + " asc " ); putSql("selectTransformColumn" ,"" + @@ -51,7 +51,7 @@ public TransformServiceSqlMap(IDatabasePlatform platform, Map re " transform_type, transform_expression, " + " transform_order, " + " last_update_time, last_update_by, create_time " + -" from $(schemaName)$(transform_column) order " + +" from $(transform_column) order " + " by transform_order " + " asc " ); @@ -62,14 +62,14 @@ public TransformServiceSqlMap(IDatabasePlatform platform, Map re " transform_type, transform_expression, " + " transform_order, " + " last_update_time, last_update_by, create_time " + -" from $(schemaName)$(transform_column) " + +" from $(transform_column) " + " where " + " transform_id = ? " + " order by transform_order asc " ); putSql("updateTransformTableSql" ,"" + "update " + -" $(schemaName)$(transform_table) " + +" $(transform_table) " + " set " + " source_node_group_id=?, " + " target_node_group_id=?, " + @@ -92,7 +92,7 @@ public TransformServiceSqlMap(IDatabasePlatform platform, Map re putSql("updateTransformColumnSql" ,"" + "update " + -" $(schemaName)$(transform_column) " + +" $(transform_column) " + " set " + " source_column_name=?, " + " pk=?, " + @@ -108,7 +108,7 @@ public TransformServiceSqlMap(IDatabasePlatform platform, Map re " target_column_name=? " ); putSql("insertTransformTableSql" ,"" + -"insert into $(schemaName)$(transform_table) " + +"insert into $(transform_table) " + " (source_node_group_id, target_node_group_id, source_catalog_name, " + " source_schema_name, source_table_name, " + " target_catalog_name, target_schema_name, target_table_name, " + @@ -117,7 +117,7 @@ public TransformServiceSqlMap(IDatabasePlatform platform, Map re " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) " ); putSql("insertTransformColumnSql" ,"" + -"insert into $(schemaName)$(transform_column) " + +"insert into $(transform_column) " + " (transform_id, include_on, target_column_name, " + " source_column_name, " + " pk, transform_type, " + @@ -126,17 +126,17 @@ public TransformServiceSqlMap(IDatabasePlatform platform, Map re " values(?,?,?,?,?,?,?,?,?,?,?) " ); putSql("deleteTransformTableSql" ,"" + -"delete from $(schemaName)$(transform_table) where " + +"delete from $(transform_table) where " + " transform_id=? " ); - putSql("deleteAllTransformTablesSql", "delete from $(schemaName)$(transform_table)"); + putSql("deleteAllTransformTablesSql", "delete from $(transform_table)"); putSql("deleteTransformColumnsSql" ,"" + -"delete from $(schemaName)$(transform_column) where " + +"delete from $(transform_column) where " + " transform_id=? " ); putSql("deleteTransformColumnSql" ,"" + -"delete from $(schemaName)$(transform_column) " + +"delete from $(transform_column) " + " where " + " transform_id=? " + " and include_on=? " + @@ -144,8 +144,8 @@ public TransformServiceSqlMap(IDatabasePlatform platform, Map re - putSql("selectMaxTransformTableLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(transform_table) where last_update_time is not null" ); - putSql("selectMaxTransformColumnLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(transform_column) where last_update_time is not null" ); + putSql("selectMaxTransformTableLastUpdateTime" ,"select max(last_update_time) from $(transform_table) where last_update_time is not null" ); + putSql("selectMaxTransformColumnLastUpdateTime" ,"select max(last_update_time) from $(transform_column) where last_update_time is not null" ); } } \ No newline at end of file diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterServiceSqlMap.java index 02c4b88337..d0a7b792ec 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterServiceSqlMap.java @@ -33,32 +33,32 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform, // @formatter:off putSql("countTriggerRoutersByRouterIdSql", - "select count(*) from $(schemaName)$(trigger_router) where router_id=? "); + "select count(*) from $(trigger_router) where router_id=? "); putSql("countTriggerRoutersByTriggerIdSql", "" - + "select count(*) from $(schemaName)$(trigger_router) where trigger_id=? "); + + "select count(*) from $(trigger_router) where trigger_id=? "); putSql("countTriggerByTriggerIdSql", "" - + "select count(*) from $(schemaName)$(trigger) where trigger_id=? "); + + "select count(*) from $(trigger) where trigger_id=? "); putSql("countTriggerByTableNameSql", "" - + "select count(*) from $(schemaName)$(trigger) where source_table_name=? "); + + "select count(*) from $(trigger) where source_table_name=? "); - putSql("deleteRouterSql", "" + "delete from $(schemaName)$(router) where router_id=? "); + putSql("deleteRouterSql", "" + "delete from $(router) where router_id=? "); - putSql("deleteAllRoutersSql", "" + "delete from $(schemaName)$(router)"); + putSql("deleteAllRoutersSql", "" + "delete from $(router)"); putSql("inactivateTriggerHistorySql", "" - + "update $(schemaName)$(trigger_hist) set inactive_time = current_timestamp, error_message=? where " + + "update $(trigger_hist) set inactive_time = current_timestamp, error_message=? where " + " trigger_hist_id=? "); - putSql("selectTriggersSql", "" + "from $(schemaName)$(trigger) t order by trigger_id asc "); + putSql("selectTriggersSql", "" + "from $(trigger) t order by trigger_id asc "); putSql("selectTriggerRoutersSql", "" - + "from $(schemaName)$(trigger_router) tr " - + " inner join $(schemaName)$(trigger) t on tr.trigger_id=t.trigger_id " - + " inner join $(schemaName)$(router) r on tr.router_id=r.router_id "); + + "from $(trigger_router) tr " + + " inner join $(trigger) t on tr.trigger_id=t.trigger_id " + + " inner join $(router) r on tr.router_id=r.router_id "); putSql("selectTriggerRoutersColumnList", " tr.trigger_id, tr.router_id, tr.create_time, tr.last_update_time, tr.last_update_by, tr.initial_load_order, tr.initial_load_select, tr.initial_load_delete_stmt, tr.ping_back_enabled, tr.enabled "); @@ -85,7 +85,7 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform, putSql("selectTriggerNameInUseSql", "" - + "select count(*) from $(schemaName)$(trigger_hist) where (name_for_update_trigger=? or name_for_insert_trigger=? or name_for_delete_trigger=?) and trigger_id != ? and inactive_time is null "); + + "select count(*) from $(trigger_hist) where (name_for_update_trigger=? or name_for_insert_trigger=? or name_for_delete_trigger=?) and trigger_id != ? and inactive_time is null "); putSql("selectGroupTriggersSql", "" + "where r.source_node_group_id = ? or r.target_node_group_id = ? order by t.channel_id "); @@ -105,7 +105,7 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform, putSql("allTriggerHistSql", "" + "select trigger_hist_id,trigger_id,source_table_name,table_hash,create_time,pk_column_names,column_names,last_trigger_build_reason,name_for_delete_trigger,name_for_insert_trigger,name_for_update_trigger,source_schema_name,source_catalog_name,trigger_row_hash,trigger_template_hash,error_message " - + " from $(schemaName)$(trigger_hist) "); + + " from $(trigger_hist) "); putSql("activeTriggerHistSqlByTriggerId", "" + "where trigger_id=? and inactive_time is null "); @@ -116,28 +116,28 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform, "" + "select " + " trigger_hist_id,trigger_id,source_table_name,table_hash,create_time,pk_column_names,column_names,last_trigger_build_reason,name_for_delete_trigger,name_for_insert_trigger,name_for_update_trigger,source_schema_name,source_catalog_name,trigger_row_hash,trigger_template_hash,error_message " - + " from $(schemaName)$(trigger_hist) where trigger_id=? and source_table_name=? and inactive_time is null order by trigger_hist_id desc "); + + " from $(trigger_hist) where trigger_id=? and source_table_name=? and inactive_time is null order by trigger_hist_id desc "); putSql("triggerHistSql", "" + "select " + " trigger_hist_id,trigger_id,source_table_name,table_hash,create_time,pk_column_names,column_names,last_trigger_build_reason,name_for_delete_trigger,name_for_insert_trigger,name_for_update_trigger,source_schema_name,source_catalog_name,trigger_row_hash,trigger_template_hash,error_message " - + " from $(schemaName)$(trigger_hist) where trigger_hist_id = ? "); + + " from $(trigger_hist) where trigger_hist_id = ? "); putSql("insertTriggerHistorySql", "" - + "insert into $(schemaName)$(trigger_hist) " + + "insert into $(trigger_hist) " + " (trigger_hist_id, trigger_id,source_table_name,table_hash,create_time,column_names,pk_column_names,last_trigger_build_reason,name_for_delete_trigger,name_for_insert_trigger,name_for_update_trigger,source_schema_name,source_catalog_name,trigger_row_hash,trigger_template_hash,error_message) " + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "); - putSql("deleteTriggerSql", "" + "delete from $(schemaName)$(trigger) where trigger_id=? "); + putSql("deleteTriggerSql", "" + "delete from $(trigger) where trigger_id=? "); putSql("deleteTriggerHistorySql", "" - + "delete from $(schemaName)$(trigger_hist) where trigger_hist_id=? "); + + "delete from $(trigger_hist) where trigger_hist_id=? "); putSql("insertTriggerSql", "" - + "insert into $(schemaName)$(trigger) " + + "insert into $(trigger) " + " (source_catalog_name,source_schema_name,source_table_name,channel_id,reload_channel_id,sync_on_update,sync_on_insert,sync_on_delete, " + " sync_on_incoming_batch,use_stream_lobs,use_capture_lobs,use_capture_old_data,use_handle_key_updates,name_for_update_trigger,name_for_insert_trigger,name_for_delete_trigger, " + " sync_on_update_condition,sync_on_insert_condition,sync_on_delete_condition,custom_on_update_text,custom_on_insert_text,custom_on_delete_text,tx_id_expression,excluded_column_names,included_column_names,sync_key_names, " @@ -146,7 +146,7 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform, putSql("updateTriggerSql", "" - + "update $(schemaName)$(trigger) " + + "update $(trigger) " + " set source_catalog_name=?,source_schema_name=?,source_table_name=?, " + " channel_id=?,reload_channel_id=?,sync_on_update=?,sync_on_insert=?,sync_on_delete=?, " + " sync_on_incoming_batch=?,use_stream_lobs=?,use_capture_lobs=?,use_capture_old_data=?,use_handle_key_updates=?,name_for_update_trigger=?,name_for_insert_trigger=?, " @@ -156,7 +156,7 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform, putSql("insertRouterSql", "" - + "insert into $(schemaName)$(router) " + + "insert into $(router) " + " (target_catalog_name,target_schema_name,target_table_name,source_node_group_id,target_node_group_id, " + " router_type,router_expression,sync_on_update,sync_on_insert,sync_on_delete,use_source_catalog_schema, " + " create_time,last_update_by,last_update_time,router_id) " @@ -164,26 +164,26 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform, putSql("updateRouterSql", "" - + "update $(schemaName)$(router) " + + "update $(router) " + " set target_catalog_name=?,target_schema_name=?,target_table_name=?,source_node_group_id=?, " + " target_node_group_id=?,router_type=?,router_expression=?,sync_on_update=?,sync_on_insert=?,sync_on_delete=?, " + " use_source_catalog_schema=?, last_update_by=?,last_update_time=? " + " where router_id=? "); putSql("deleteTriggerRouterSql", "" - + "delete from $(schemaName)$(trigger_router) where trigger_id=? and router_id=? "); + + "delete from $(trigger_router) where trigger_id=? and router_id=? "); - putSql("deleteAllTriggerRoutersSql", "delete from $(schemaName)$(trigger_router)"); + putSql("deleteAllTriggerRoutersSql", "delete from $(trigger_router)"); putSql("insertTriggerRouterSql", "" - + "insert into $(schemaName)$(trigger_router) " + + "insert into $(trigger_router) " + " (initial_load_order,initial_load_select,initial_load_delete_stmt,ping_back_enabled,create_time,last_update_by,last_update_time,enabled,trigger_id,router_id) " + " values(?,?,?,?,?,?,?,?,?,?) "); putSql("updateTriggerRouterSql", "" - + "update $(schemaName)$(trigger_router) " + + "update $(trigger_router) " + " set initial_load_order=?,initial_load_select=?,initial_load_delete_stmt=?,ping_back_enabled=?,last_update_by=?,last_update_time=?,enabled=? " + " where trigger_id=? and router_id=? "); @@ -193,18 +193,18 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform, putSql("selectTriggerRouterSql", "" + "where t.trigger_id=? and r.router_id=? "); - putSql("selectRouterSql", "" + "from $(schemaName)$(router) r where r.router_id=? "); + putSql("selectRouterSql", "" + "from $(router) r where r.router_id=? "); - putSql("selectRoutersSql", "" + "from $(schemaName)$(router) r order by r.router_id "); + putSql("selectRoutersSql", "" + "from $(router) r order by r.router_id "); putSql("selectRouterByNodeGroupLinkWhereSql", - "from $(schemaName)$(router) r where r.source_node_group_id=? and r.target_node_group_id=? order by r.router_id "); + "from $(router) r where r.source_node_group_id=? and r.target_node_group_id=? order by r.router_id "); putSql("selectTriggerByIdSql", "" + "where t.trigger_id = ? "); - putSql("selectMaxTriggerLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(trigger) where last_update_time is not null" ); - putSql("selectMaxRouterLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(router) where last_update_time is not null" ); - putSql("selectMaxTriggerRouterLastUpdateTime" ,"select max(last_update_time) from $(schemaName)$(trigger_router) where last_update_time is not null" ); + putSql("selectMaxTriggerLastUpdateTime" ,"select max(last_update_time) from $(trigger) where last_update_time is not null" ); + putSql("selectMaxRouterLastUpdateTime" ,"select max(last_update_time) from $(router) where last_update_time is not null" ); + putSql("selectMaxTriggerRouterLastUpdateTime" ,"select max(last_update_time) from $(trigger_router) where last_update_time is not null" ); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/UpdateServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/UpdateServiceSqlMap.java index fbe7d9cad0..664c5d26da 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/UpdateServiceSqlMap.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/UpdateServiceSqlMap.java @@ -33,12 +33,12 @@ public UpdateServiceSqlMap(IDatabasePlatform platform, Map repla putSql("countOutgoing", "select count(*) as batch_count, sum(byte_count) as byte_count, sum(data_event_count) as row_count " + - "from $(schemaName)$(outgoing_batch) " + + "from $(outgoing_batch) " + "where status = 'OK' and channel_id not in ('config', 'heartbeat') and last_update_time >= ?"); putSql("countIncoming", "select count(*) as batch_count, sum(byte_count) as byte_count, sum(statement_count) as row_count " + - "from $(schemaName)$(incoming_batch) " + + "from $(incoming_batch) " + "where status = 'OK' and channel_id not in ('config', 'heartbeat') and last_update_time >= ?"); } diff --git a/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesService.java b/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesService.java index fefa6b4274..383e41d22e 100644 --- a/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesService.java +++ b/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesService.java @@ -52,8 +52,8 @@ public boolean insertIntoTestUseStreamLob(int id, String tableName, String lobVa ISqlTransaction transaction = null; try { transaction = sqlTemplate.startSqlTransaction(); - boolean updated = transaction.prepareAndExecute(platform.scrubSql(String.format( - "insert into %s (test_id, test_blob) values(?, ?)", tableName)), + boolean updated = transaction.prepareAndExecute(String.format( + "insert into %s (test_id, test_blob) values(?, ?)", tableName), new Object[] { id, lobValue.getBytes() }, new int[] { Types.INTEGER, Types.BLOB }) > 0; transaction.commit(); @@ -76,8 +76,8 @@ public boolean updateTestUseStreamLob(int id, String tableName, String lobValue) ISqlTransaction transaction = null; try { transaction = sqlTemplate.startSqlTransaction(); - boolean updated = transaction.prepareAndExecute(platform.scrubSql( - String.format("update %s set test_blob=? where test_id=?", tableName)), + boolean updated = transaction.prepareAndExecute( + String.format("update %s set test_blob=? where test_id=?", tableName), new Object[] { lobValue.getBytes(), id }, new int[] { Types.BLOB, Types.INTEGER }) > 0; transaction.commit(); @@ -97,12 +97,12 @@ public boolean updateTestUseStreamLob(int id, String tableName, String lobValue) public void assertTestBlobIsInDatabase(int id, String tableName, String expected) { if (symmetricDialect.isBlobSyncSupported()) { - int rowCount = sqlTemplate.queryForInt(platform.scrubSql("select count(*) from " - + tableName + " where test_id=?"), id); + int rowCount = sqlTemplate.queryForInt("select count(*) from " + + tableName + " where test_id=?", id); Assert.assertEquals("The " + id + " row for table " + tableName + " did not exist", 1, rowCount); - Map values = sqlTemplate.queryForMap(platform.scrubSql("select test_blob from " - + tableName + " where test_id=?"), id); + Map values = sqlTemplate.queryForMap("select test_blob from " + + tableName + " where test_id=?", id); Assert.assertEquals( "The blob column for test_use_stream_lob was not loaded into the client database", expected, values != null && values.get("TEST_BLOB") != null ? new String( @@ -155,7 +155,7 @@ public void insertCustomer(Customer customer) { public int updateCustomer(int id, String column, Object value, int type) { return sqlTemplate.update( - platform.scrubSql(String.format("update test_customer set %s=? where customer_id=?", column)), + String.format("update test_customer set %s=? where customer_id=?", column), new Object[] { value, id }, new int[] { type, Types.NUMERIC }); } diff --git a/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesServiceSqlMap.java b/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesServiceSqlMap.java index 2075191a3a..d37f43b184 100644 --- a/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesServiceSqlMap.java +++ b/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesServiceSqlMap.java @@ -33,18 +33,18 @@ public TestTablesServiceSqlMap(IDatabasePlatform platform, Map r super(platform, replacementTokens); putSql("insertCustomerSql", - "insert into $(schemaName)test_customer " + "insert into test_customer " + "(customer_id, name, is_active, address, city, state, zip, entry_timestamp, entry_time, notes, icon) " + "values(?,?,?,?,?,?,?,?,?,?,?)"); putSql("insertIntoTestTriggersTableSql", - "insert into $(schemaName)test_triggers_table (id, string_one_value, string_two_value) values(?,?,?)"); + "insert into test_triggers_table (id, string_one_value, string_two_value) values(?,?,?)"); - putSql("insertOrderSql", "insert into $(schemaName)test_order_header (order_id, customer_id, status, deliver_date) values(?,?,?,?)"); + putSql("insertOrderSql", "insert into test_order_header (order_id, customer_id, status, deliver_date) values(?,?,?,?)"); - putSql("insertOrderDetailSql", "insert into $(schemaName)test_order_detail (order_id, line_number, item_type, item_id, quantity, price) values(?,?,?,?,?,?)"); + putSql("insertOrderDetailSql", "insert into test_order_detail (order_id, line_number, item_type, item_id, quantity, price) values(?,?,?,?,?,?)"); - putSql("selectOrderSql", "select order_id, customer_id, status, deliver_date from $(schemaName)test_order_header where order_id = ?"); + putSql("selectOrderSql", "select order_id, customer_id, status, deliver_date from test_order_header where order_id = ?"); } } diff --git a/symmetric-core/src/test/resources/test-services-setup.sql b/symmetric-core/src/test/resources/test-services-setup.sql index 7a3112a388..ade130298b 100644 --- a/symmetric-core/src/test/resources/test-services-setup.sql +++ b/symmetric-core/src/test/resources/test-services-setup.sql @@ -19,146 +19,146 @@ -- under the License. -- -insert into $(schemaName)sym_channel (channel_id, processing_order, max_batch_size, max_batch_to_send, contains_big_lob, enabled, max_network_kbps, description) values('testchannel', 1, 50, 50, 1, 1, 0.00, null); -insert into $(schemaName)sym_channel (channel_id, processing_order, max_batch_size, max_batch_to_send, contains_big_lob, enabled, max_network_kbps, description) values('other', 0, 1, 50, 1, 1, 0.00, null); +insert into sym_channel (channel_id, processing_order, max_batch_size, max_batch_to_send, contains_big_lob, enabled, max_network_kbps, description) values('testchannel', 1, 50, 50, 1, 1, 0.00, null); +insert into sym_channel (channel_id, processing_order, max_batch_size, max_batch_to_send, contains_big_lob, enabled, max_network_kbps, description) values('other', 0, 1, 50, 1, 1, 0.00, null); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('symmetric','a group representing symmetric configuration'); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('test-root-group','a test config'); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('test-node-group','a test config'); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('test-node-group2','another test config'); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('test-node-group3','another test config'); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('test-group-for-root-to-pull','another test config'); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('unit-test-only','a group used for unit testing'); +insert into sym_node_group (node_group_id, description) values ('symmetric','a group representing symmetric configuration'); +insert into sym_node_group (node_group_id, description) values ('test-root-group','a test config'); +insert into sym_node_group (node_group_id, description) values ('test-node-group','a test config'); +insert into sym_node_group (node_group_id, description) values ('test-node-group2','another test config'); +insert into sym_node_group (node_group_id, description) values ('test-node-group3','another test config'); +insert into sym_node_group (node_group_id, description) values ('test-group-for-root-to-pull','another test config'); +insert into sym_node_group (node_group_id, description) values ('unit-test-only','a group used for unit testing'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-root-group', 'P'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-node-group2', 'P'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-node-group', 'W'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-node-group3', 'W'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-group-for-root-to-pull','test-root-group', 'W'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-node-group','test-root-group', 'P'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('symmetric','test-root-group', 'P'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-root-group', 'P'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-node-group2', 'P'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-node-group', 'W'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-node-group3', 'W'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-group-for-root-to-pull','test-root-group', 'W'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-node-group','test-root-group', 'P'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('symmetric','test-root-group', 'P'); -insert into $(schemaName)sym_node values ('00000', 'test-root-group', '00000', 1, 'internal://root', '1', '2.0', '2.0','H2', '1.1', current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('1', 'test-node-group', '1', 1, 'internal://root', '1', '2.0', '2.0','H2', '5.0', current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('00001', 'test-node-group', '00001', 1, 'http://localhost:8080/sync', '1', '2.0', '2.0', 'H2', '5.0', current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('00002', 'test-node-group', '00002', 0, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('00003', 'test-node-group', '00003', 1, 'http://localhost:8080/', '0', '2.0', '2.0', 'H2', '4', current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('00010', 'test-node-group2', '00010', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('00030', 'test-node-group3', '00030', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('00011', 'test-node-group2', '00011', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('pull1', 'test-group-for-root-to-pull', 'test', 1, 'http://localhost:8080/sync', '1', '2.0', '2.0', 'H2', '5.0', current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('pull2', 'test-group-for-root-to-pull', 'test', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('pull3', 'test-group-for-root-to-pull', 'test', 1, 'http://localhost:8080/', '0', '2.0', '2.0', 'H2', '4', current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('55555', 'test-node-group2', '00011', 1, 'http://snoopdog.com', null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('00000', 'test-root-group', '00000', 1, 'internal://root', '1', '2.0', '2.0','H2', '1.1', current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('1', 'test-node-group', '1', 1, 'internal://root', '1', '2.0', '2.0','H2', '5.0', current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('00001', 'test-node-group', '00001', 1, 'http://localhost:8080/sync', '1', '2.0', '2.0', 'H2', '5.0', current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('00002', 'test-node-group', '00002', 0, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('00003', 'test-node-group', '00003', 1, 'http://localhost:8080/', '0', '2.0', '2.0', 'H2', '4', current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('00010', 'test-node-group2', '00010', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('00030', 'test-node-group3', '00030', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('00011', 'test-node-group2', '00011', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('pull1', 'test-group-for-root-to-pull', 'test', 1, 'http://localhost:8080/sync', '1', '2.0', '2.0', 'H2', '5.0', current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('pull2', 'test-group-for-root-to-pull', 'test', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('pull3', 'test-group-for-root-to-pull', 'test', 1, 'http://localhost:8080/', '0', '2.0', '2.0', 'H2', '4', current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('55555', 'test-node-group2', '00011', 1, 'http://snoopdog.com', null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); -- For testCheckForOfflineNodes. These nodes have an old heartbeat and will be set to offline -insert into $(schemaName)sym_node values ('66666', 'unit-test-only', '66666', 1, null, null, '2.0', '2.0', null, null, {ts '2000-01-01 00:00:00'}, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node values ('77777', 'unit-test-only', '77777', 1, null, null, '2.0', '2.0', null, null, {ts '2000-01-01 00:00:00'}, '-08:00', 0, 0, '00000', 'engine'); +insert into sym_node values ('66666', 'unit-test-only', '66666', 1, null, null, '2.0', '2.0', null, null, {ts '2000-01-01 00:00:00'}, null, 0, 0, '00000', 'engine'); +insert into sym_node values ('77777', 'unit-test-only', '77777', 1, null, null, '2.0', '2.0', null, null, {ts '2000-01-01 00:00:00'}, '-08:00', 0, 0, '00000', 'engine'); -- For testFindNodesThatOriginatedHere -insert into $(schemaName)sym_node values ('44001', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00011', 'engine'); -insert into $(schemaName)sym_node values ('44002', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00012', 'engine'); -insert into $(schemaName)sym_node values ('44003', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00011', 'engine'); -insert into $(schemaName)sym_node values ('44004', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '44002', 'engine'); -insert into $(schemaName)sym_node values ('44005', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '44001', 'engine'); -insert into $(schemaName)sym_node values ('44006', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '44003', 'engine'); +insert into sym_node values ('44001', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00011', 'engine'); +insert into sym_node values ('44002', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00012', 'engine'); +insert into sym_node values ('44003', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00011', 'engine'); +insert into sym_node values ('44004', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '44002', 'engine'); +insert into sym_node values ('44005', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '44001', 'engine'); +insert into sym_node values ('44006', 'unit-test-only', '44001', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '44003', 'engine'); -insert into $(schemaName)sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('00001', 'secret', 0, {ts '2007-01-01 01:01:01'}, 0, {ts '2007-01-01 01:01:01'}, '00000'); -insert into $(schemaName)sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('00002', 'supersecret', 1, null, 0, null, '00000'); -insert into $(schemaName)sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('00003', 'notsecret', 0, {ts '2007-01-01 01:01:01'}, 0, {ts '2007-01-01 01:01:01'}, '00000'); -insert into $(schemaName)sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('00000', 'notsecret', 0, {ts '2007-01-01 01:01:01'}, 0, null, '00000'); -insert into $(schemaName)sym_node_identity values ('00000'); +insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('00001', 'secret', 0, {ts '2007-01-01 01:01:01'}, 0, {ts '2007-01-01 01:01:01'}, '00000'); +insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('00002', 'supersecret', 1, null, 0, null, '00000'); +insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('00003', 'notsecret', 0, {ts '2007-01-01 01:01:01'}, 0, {ts '2007-01-01 01:01:01'}, '00000'); +insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('00000', 'notsecret', 0, {ts '2007-01-01 01:01:01'}, 0, null, '00000'); +insert into sym_node_identity values ('00000'); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) values( '1000', 'test-root-group', 'test-root-group', current_timestamp, current_timestamp); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) values( '2000', 'symmetric', 'test-root-group', current_timestamp, current_timestamp); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) values( '3000', 'test-root-group', 'test-node-group2', current_timestamp, current_timestamp); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) values( 'test_2_root', 'test-node-group', 'test-root-group', current_timestamp, current_timestamp); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) values( 'root_2_test', 'test-root-group', 'test-node-group', current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, name_for_insert_trigger, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, name_for_insert_trigger, last_update_time, create_time) values( '1000', 'test_triggers_table', 'testchannel', 'insert_test_tbl_trg', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '1000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '3000', 'test_sync_incoming_batch', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '3000', '3000', 1, current_timestamp, current_timestamp); -- AdditiveDataLoaderFilter test data -insert into $(schemaName)test_add_dl_table_1 values('k3','k4',1,2.0,3,4.0,5,'6',7); -insert into $(schemaName)test_add_dl_table_1 values('k5','k6',1,3.0,5,7.0,9,'11',13); -insert into $(schemaName)test_add_dl_table_2 values('k3',1); +insert into test_add_dl_table_1 values('k3','k4',1,2.0,3,4.0,5,'6',7); +insert into test_add_dl_table_1 values('k5','k6',1,3.0,5,7.0,9,'11',13); +insert into test_add_dl_table_2 values('k3',1); -insert into $(schemaName)sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) +insert into sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) values ('simple_2_a', 'test-node-group', 'test-root-group', 'SIMPLE', 'TEST_TRANSFORM_A', 'LOAD', 0, 'DEL_ROW', 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('simple_2_a', '*', 'ID', 'ID_A', 1, null, null, 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('simple_2_a', '*', 'S1', 'S1_A', 0, null, null, 2); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('simple_2_a', '*', null, 'S2_A', 0, 'const', 'CONSTANT', 3); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('simple_2_a', '*', 'TOTAL', 'DECIMAL_A', 0, 'additive', null, 4); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('simple_2_a', '*', null, 'LONGSTRING_A', 0, 'bsh', 'S1+"-"+ID', 5); -insert into $(schemaName)sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) +insert into sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) values ('source1_to_a', 'test-node-group', 'test-root-group', 'SOURCE_1', 'TEST_TRANSFORM_A', 'LOAD', 0, 'DEL_ROW', 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source1_to_a', '*', 'ID', 'ID_A', 1, null, null, 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source1_to_a', '*', 'S1', 'S1_A', 0, null, null, 2); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source1_to_a', 'I', null, 'S2_A', 0, 'const', 'CONSTANT', 3); -insert into $(schemaName)sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) +insert into sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) values ('source2_to_a', 'test-node-group', 'test-root-group', 'SOURCE_2', 'TEST_TRANSFORM_A', 'LOAD', 1, 'UPDATE_COL', 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source2_to_a', '*', 'ID2', 'ID_A', 1, null, null, 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source2_to_a', 'U', 'S2', 'S2_A', 0, null, null, 2); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source2_to_a', 'D', null, 'S2_A', 0, 'const', 'DELETED', 2); -insert into $(schemaName)sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) +insert into sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) values ('sourceb_to_b', 'test-node-group', 'test-root-group', 'SOURCE_B', 'TEST_TRANSFORM_B', 'LOAD', 1, 'DEL_ROW', 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('sourceb_to_b', '*', 'ID', 'ID_B', 1, null, null, 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('sourceb_to_b', '*', null, 'S1_B', 0, 'lookup', 'select column_two from test_lookup_table where column_one=:ID', 2); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('sourceb_to_b', '*', null, 'S2_B', 0, 'variable', 'system_timestamp', 3); -insert into $(schemaName)sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) +insert into sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) values ('one_to_multi', 'test-node-group', 'test-root-group', 'SOURCE_5', 'TARGET_5', 'LOAD', 0, 'NONE', 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('one_to_multi', '*', 'S5_ID', 'ID_TARGET', 1, 'multiply', 'select column_two from test_lookup_table where column_one=:S5_ID', 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('one_to_multi', '*', 'S5_VALUE', 'VALUE_TARGET', 0, 'copy', null, 3); -insert into $(schemaName)sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) +insert into sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) values ('test_ignore_row_from_bsh', 'test-node-group', 'test-root-group', 'SOURCE_6', 'TARGET_6', 'LOAD', 0, 'NONE', 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('test_ignore_row_from_bsh', '*', 'S6_ID', 'ID_TARGET', 1, 'bsh', 'throw new org.jumpmind.symmetric.transform.IgnoreRowException()', 1); -insert into $(schemaName)sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) +insert into sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) values ('source3_to_d', 'test-node-group', 'test-root-group', 'SOURCE_3', 'TEST_TRANSFORM_D', 'LOAD', 1, 'NONE', 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source3_to_d', '*', 'ID', 'ID_D', 1, null, null, 1); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source3_to_d', '*', 'S1', 'S1_D', 0, null, null, 2); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source3_to_d', '*', 'S2', 'S2_D', 0, null, null, 2); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source3_to_d', 'I', null, 'BIGINT_D', 0, 'const', '1', 3); -insert into $(schemaName)sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) +insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('source3_to_d', 'U', null, 'LONGSTRING_D', 0, 'const', 'Updated', 4); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java index f09d03d1ec..0bdda3f3b5 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java @@ -553,9 +553,7 @@ protected String getDateTimeStringValue(String name, int type, Row row, boolean } public Map getSqlScriptReplacementTokens() { - Map replacementTokens = new HashMap(); - replacementTokens.put("\\$\\(schemaName\\)", ""); - return replacementTokens; + return null; } public String scrubSql(String sql) { diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/nuodb/NuoDbDatabasePlatform.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/nuodb/NuoDbDatabasePlatform.java index 37fa1acb87..556c05cce5 100644 --- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/nuodb/NuoDbDatabasePlatform.java +++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/nuodb/NuoDbDatabasePlatform.java @@ -17,9 +17,6 @@ * under the License. */ package org.jumpmind.db.platform.nuodb; -import java.util.HashMap; -import java.util.Map; - import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; @@ -43,17 +40,11 @@ public class NuoDbDatabasePlatform extends AbstractJdbcDatabasePlatform { /* The subprotocol used by the standard MySQL driver. */ public static final String JDBC_SUBPROTOCOL = "nuodb"; - private Map sqlScriptReplacementTokens; - /* * Creates a new platform instance. */ public NuoDbDatabasePlatform(DataSource dataSource, SqlTemplateSettings settings) { super(dataSource, settings); - - String delimiter = getDatabaseInfo().getDelimiterToken(); - sqlScriptReplacementTokens = new HashMap(); - sqlScriptReplacementTokens.put("\\$\\(schemaName\\)", delimiter + getDefaultSchema() + delimiter + "." ); } @Override @@ -91,11 +82,6 @@ public String getDefaultCatalog() { return null; } - @Override - public Map getSqlScriptReplacementTokens() { - return sqlScriptReplacementTokens; - } - @Override public PermissionResult getCreateSymTriggerPermission() { String delimiter = getDatabaseInfo().getDelimiterToken(); diff --git a/symmetric-jdbc/src/test/java/org/jumpmind/db/DatabasePlatformTest.java b/symmetric-jdbc/src/test/java/org/jumpmind/db/DatabasePlatformTest.java index 813fd5908b..efa528e86a 100644 --- a/symmetric-jdbc/src/test/java/org/jumpmind/db/DatabasePlatformTest.java +++ b/symmetric-jdbc/src/test/java/org/jumpmind/db/DatabasePlatformTest.java @@ -20,6 +20,12 @@ */ package org.jumpmind.db; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + import java.io.InputStreamReader; import java.sql.Types; import java.util.List; @@ -37,12 +43,8 @@ import org.jumpmind.db.platform.PermissionResult; import org.jumpmind.db.platform.PermissionResult.Status; import org.jumpmind.db.platform.PermissionType; -import org.jumpmind.db.platform.nuodb.NuoDbJdbcSqlTemplate; import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.SqlScript; - -import static org.junit.Assert.*; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -100,11 +102,7 @@ public void testTableRebuild() throws Exception { ISqlTemplate template = platform.getSqlTemplate(); String delimiter = platform.getDatabaseInfo().getDelimiterToken(); delimiter = delimiter != null ? delimiter : ""; - if(template instanceof NuoDbJdbcSqlTemplate){ - assertEquals(1, template.update(String.format("insert into %s%s%s%s%s%s%s values(?,?)", delimiter, tableFromDatabase.getSchema(), delimiter,".", delimiter, tableFromDatabase.getName(), delimiter), 1, "test")); - }else{ - assertEquals(1, template.update(String.format("insert into %s%s%s values(?,?)", delimiter, tableFromDatabase.getName(), delimiter), 1, "test")); - } + assertEquals(1, template.update(String.format("insert into %s%s%s values(?,?)", delimiter, tableFromDatabase.getName(), delimiter), 1, "test")); table.addColumn(new Column("ID2", true)); table.getColumnWithName("ID2").setTypeCode(Types.VARCHAR); @@ -122,11 +120,7 @@ public void testTableRebuild() throws Exception { tableFromDatabase = platform.getTableFromCache(table.getName(), true); assertNotNull(tableFromDatabase); assertEquals(4, tableFromDatabase.getColumnCount()); - if(template instanceof NuoDbJdbcSqlTemplate){ - assertEquals(1, template.queryForLong(String.format("select count(*) from %s%s%s%s%s%s%s", delimiter, tableFromDatabase.getSchema(), delimiter,".", delimiter, tableFromDatabase.getName(), delimiter))); - }else{ - assertEquals(1, template.queryForLong(String.format("select count(*) from %s%s%s", delimiter, tableFromDatabase.getName(), delimiter))); - } + assertEquals(1, template.queryForLong(String.format("select count(*) from %s%s%s", delimiter, tableFromDatabase.getName(), delimiter))); // alter to remove two columns that will cause a table rebuild platform.alterTables(false, origTable); @@ -134,11 +128,7 @@ public void testTableRebuild() throws Exception { assertNotNull(tableFromDatabase); assertEquals(2, tableFromDatabase.getColumnCount()); - if(template instanceof NuoDbJdbcSqlTemplate){ - assertEquals(1, template.queryForLong(String.format("select count(*) from %s%s%s%s%s%s%s", delimiter, tableFromDatabase.getSchema(), delimiter,".", delimiter, tableFromDatabase.getName(), delimiter))); - }else{ - assertEquals(1, template.queryForLong(String.format("select count(*) from %s%s%s", delimiter, tableFromDatabase.getName(), delimiter))); - } + assertEquals(1, template.queryForLong(String.format("select count(*) from %s%s%s", delimiter, tableFromDatabase.getName(), delimiter))); } @@ -248,13 +238,7 @@ public void testUpgradePrimaryKeyAutoIncrementFromIntToBigInt() throws Exception assertTrue(tableFromDatabase.getColumnWithName("ID").isPrimaryKey()); - String insertSql = ""; - - if(platform.getSqlTemplate() instanceof NuoDbJdbcSqlTemplate){ - insertSql = "insert into \"" + tableFromDatabase.getSchema() + "\".\"TEST_UPGRADE\" (\"ID\",\"NOTES\") values(null,?)"; - }else{ - insertSql = "insert into \"TEST_UPGRADE\" (\"ID\",\"NOTES\") values(null,?)"; - } + String insertSql = "insert into \"TEST_UPGRADE\" (\"ID\",\"NOTES\") values(null,?)"; insertSql = insertSql.replaceAll("\"", platform.getDatabaseInfo().getDelimiterToken()); diff --git a/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java b/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java index dd53a8231a..fef7dcc5d5 100644 --- a/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java +++ b/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java @@ -39,7 +39,6 @@ import org.apache.log4j.Level; import org.jumpmind.db.model.Table; import org.jumpmind.db.platform.DatabaseNamesConstants; -import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.TestConstants; @@ -142,8 +141,8 @@ public void test02RegisterClientWithRoot() { @Test(timeout = 120000) public void test03InitialLoad() { logTestRunning(); - serverTestService.insertIntoTestUseStreamLob(100, "$(schemaName)test_use_stream_lob", THIS_IS_A_TEST); - serverTestService.insertIntoTestUseStreamLob(100, "$(schemaName)test_use_capture_lob", THIS_IS_A_TEST); + serverTestService.insertIntoTestUseStreamLob(100, "test_use_stream_lob", THIS_IS_A_TEST); + serverTestService.insertIntoTestUseStreamLob(100, "test_use_capture_lob", THIS_IS_A_TEST); Customer customer = new Customer(301, "Linus", true, "42 Blanket Street", "Santa Claus", "IN", 90009, new Date(), new Date(), THIS_IS_A_TEST, BINARY_DATA); @@ -211,7 +210,7 @@ public void test03InitialLoad() { @Test(timeout = 120000) public void test04LobSyncUsingStreaming() throws Exception { String text = "Another test. Should not find this in text in sym_data, but it should be in the client database"; - if (serverTestService.insertIntoTestUseStreamLob(200, "$(schemaName)test_use_stream_lob", text)) { + if (serverTestService.insertIntoTestUseStreamLob(200, "test_use_stream_lob", text)) { //IDatabasePlatform platform = getServer().getDatabasePlatform(); String rowData = getServer() .getSqlTemplate() @@ -221,14 +220,14 @@ public void test04LobSyncUsingStreaming() throws Exception { assertTrue("Did not find the id in the row data", rowData.contains("200")); assertEquals("\"200\",,,,,,", rowData); clientPull(); - clientTestService.assertTestBlobIsInDatabase(200, "$(schemaName)test_use_stream_lob", text); + clientTestService.assertTestBlobIsInDatabase(200, "test_use_stream_lob", text); } } @Test(timeout = 120000) public void test05LobSyncUsingCapture() throws Exception { String text = "Another test. Should not find this in text in sym_data, but it should be in the client database"; - if (serverTestService.insertIntoTestUseStreamLob(200, "$(schemaName)test_use_capture_lob", text)) { + if (serverTestService.insertIntoTestUseStreamLob(200, "test_use_capture_lob", text)) { String rowData = getServer() .getSqlTemplate() .queryForObject( @@ -236,12 +235,12 @@ public void test05LobSyncUsingCapture() throws Exception { String.class); assertTrue("Did not find the id in the row data", rowData.contains("200")); clientPull(); - clientTestService.assertTestBlobIsInDatabase(200, "$(schemaName)test_use_capture_lob", text); + clientTestService.assertTestBlobIsInDatabase(200, "test_use_capture_lob", text); String updateText = "The text was updated"; - serverTestService.updateTestUseStreamLob(200, "$(schemaName)test_use_capture_lob", updateText); + serverTestService.updateTestUseStreamLob(200, "test_use_capture_lob", updateText); clientPull(); - serverTestService.assertTestBlobIsInDatabase(200, "$(schemaName)test_use_capture_lob", updateText); + serverTestService.assertTestBlobIsInDatabase(200, "test_use_capture_lob", updateText); } } diff --git a/symmetric-server/src/test/resources/test-integration-root-setup.sql b/symmetric-server/src/test/resources/test-integration-root-setup.sql index cd69482c42..f472fb5ebb 100644 --- a/symmetric-server/src/test/resources/test-integration-root-setup.sql +++ b/symmetric-server/src/test/resources/test-integration-root-setup.sql @@ -19,133 +19,133 @@ -- under the License. -- -insert into $(schemaName)sym_channel (channel_id, processing_order, max_batch_size, max_batch_to_send, contains_big_lob, enabled, description) values('testchannel', 1, 50, 50, 1, 1, null); +insert into sym_channel (channel_id, processing_order, max_batch_size, max_batch_to_send, contains_big_lob, enabled, description) values('testchannel', 1, 50, 50, 1, 1, null); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('test-root-group','a test config'); -insert into $(schemaName)sym_node_group (node_group_id, description) values ('test-node-group','a test config'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-node-group','test-root-group', 'P'); -insert into $(schemaName)sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-node-group', 'W'); +insert into sym_node_group (node_group_id, description) values ('test-root-group','a test config'); +insert into sym_node_group (node_group_id, description) values ('test-node-group','a test config'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-node-group','test-root-group', 'P'); +insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('test-root-group','test-node-group', 'W'); -insert into $(schemaName)sym_node values ('00000', 'test-root-group', '00000', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); -insert into $(schemaName)sym_node_identity values ('00000'); +insert into sym_node values ('00000', 'test-root-group', '00000', 1, null, null, '2.0', '2.0', null, null, current_timestamp, null, 0, 0, '00000', 'engine'); +insert into sym_node_identity values ('00000'); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) values( '1000', 'test-root-group', 'test-node-group', current_timestamp, current_timestamp); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, create_time, last_update_time) values( '2000', 'test-node-group', 'test-root-group', current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, tx_id_expression, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, tx_id_expression, last_update_time, create_time) values( '1000', 'test_very_long_table_name_1234', 'testchannel', '$(curTriggerValue).$(curColumnPrefix)id', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '1000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '2000', 'test_triggers_table', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '2000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '2000', '2000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '3000', 'test_customer', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '3000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '4000', 'test_order_header', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '4000', '2000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, sync_on_update_condition, sync_on_insert_condition, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, sync_on_update_condition, sync_on_insert_condition, last_update_time, create_time) values( '4500', 'test_order_header', 'testchannel', '$(newTriggerValue).$(newColumnPrefix)status = ''C''', '$(newTriggerValue).$(newColumnPrefix)status = ''C''', current_timestamp,current_timestamp); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, router_type, router_expression, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, router_type, router_expression, create_time, last_update_time) values( '4500', 'test-root-group', 'test-node-group', 'column', 'STATUS=C', current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '4500', '4500', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '5000', 'test_order_detail', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '5000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '6000', 'test_store_status', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '6000', '2000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, sync_on_update,sync_on_insert,sync_on_delete, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, sync_on_update,sync_on_insert,sync_on_delete, last_update_time, create_time) values( '7000', 'test_key_word', 'testchannel', 0, 0, 0, current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '7000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '8000', 'TEST_ALL_CAPS', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '8000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '9000', 'Test_Mixed_Case', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '9000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '10000', 'one_column_table', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '10000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '11000', 'no_primary_key_table', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '11000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '12000', 'test_sync_column_level', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '12000', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values( '13000', 'test_target_table_a', 'testchannel', current_timestamp,current_timestamp); -insert into $(schemaName)sym_router (router_id,source_node_group_id, target_node_group_id, target_table_name, create_time, last_update_time) +insert into sym_router (router_id,source_node_group_id, target_node_group_id, target_table_name, create_time, last_update_time) values( '13000', 'test-root-group', 'test-node-group', 'test_target_table_b', current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( '13000', '13000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, use_stream_lobs, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, use_stream_lobs, last_update_time, create_time) values( 'test_use_stream_lob', 'test_use_stream_lob', 'testchannel', 1, current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( 'test_use_stream_lob', '1000', 100, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, use_capture_lobs, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, use_capture_lobs, last_update_time, create_time) values( 'test_use_capture_lob', 'test_use_capture_lob', 'testchannel', 1, current_timestamp,current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values( 'test_use_capture_lob', '1000', 100, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values ('test_a', 'test_a', 'testchannel', current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values ('test_a', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) +insert into sym_trigger (trigger_id, source_table_name, channel_id, last_update_time, create_time) values ('test_b', 'test_b', 'testchannel', current_timestamp, current_timestamp); -insert into $(schemaName)sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) +insert into sym_trigger_router (trigger_id, router_id, initial_load_order, last_update_time, create_time) values ('test_b', '1000', 1, current_timestamp, current_timestamp); -insert into $(schemaName)test_customer +insert into test_customer (customer_id, name, is_active, address, city, state, zip, entry_timestamp, entry_time) values(100, 'John Smith', '1', '300 Main Street', 'Columbus', 'OH', 43230, current_timestamp, null); -insert into $(schemaName)test_order_header +insert into test_order_header (order_id, customer_id, status, deliver_date) values('1', 100, null, null); -insert into $(schemaName)test_order_detail +insert into test_order_detail (order_id, line_number, item_type, item_id, quantity, price) values('1', 1, 'STCK', '110000055', 5, 1.29); -insert into $(schemaName)test_sync_column_level +insert into test_sync_column_level (id, string_value, time_value, date_value, bigint_value, decimal_value) values (1, 'data',current_timestamp, null, 100, 123.45); From 33f9604aa7c6dcc35f8ae93b925fc3bf35e98aa8 Mon Sep 17 00:00:00 2001 From: klementinastojanovska Date: Fri, 28 Jul 2017 11:55:41 -0400 Subject: [PATCH 2/2] NuoDb Dialect --- .../org/jumpmind/symmetric/service/impl/AbstractService.java | 1 - .../java/org/jumpmind/symmetric/test/TestTablesService.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java index 08907a6cf5..dcc37b5f7a 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java @@ -35,7 +35,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.db.platform.nuodb.NuoDbDatabasePlatform; import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.symmetric.SymmetricException; diff --git a/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesService.java b/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesService.java index 383e41d22e..3c1bc5769c 100644 --- a/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesService.java +++ b/symmetric-core/src/test/java/org/jumpmind/symmetric/test/TestTablesService.java @@ -27,13 +27,11 @@ import org.jumpmind.db.model.Table; import org.jumpmind.db.platform.DatabaseInfo; import org.jumpmind.db.platform.DatabaseNamesConstants; -import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.sql.Row; import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.service.impl.AbstractService; -import org.jumpmind.symmetric.service.impl.TriggerRouterServiceSqlMap; import org.junit.Assert; import org.junit.Ignore;