Skip to content

Commit

Permalink
0001307: Revert
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenson42
chenson42 committed Jul 9, 2013
1 parent dbfae8c commit 3be0806
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 58 deletions.
11 changes: 4 additions & 7 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbyTriggerTemplate.java
View file
Expand Up @@ -65,9 +65,8 @@ public DerbyTriggerTemplate(ISymmetricDialect symmetricDialect) {
" '$(channelName)', 'I', $(triggerHistoryId), \n" +
" $(txIdExpression), \n" +
" $(externalSelect), \n" +
" '$(columnNames)', \n" +
" '$(pkColumnNames)'); \n" +
" $(custom_on_insert_text) \n" );
" '$(columnNames)', \n" +
" '$(pkColumnNames)'); \n");

sqlTemplates.put("updateTriggerTemplate" ,
"CREATE TRIGGER $(triggerName) \n" +
Expand All @@ -81,8 +80,7 @@ public DerbyTriggerTemplate(ISymmetricDialect symmetricDialect) {
" $(txIdExpression), \n" +
" $(externalSelect), \n" +
" '$(columnNames)', \n" +
" '$(pkColumnNames)'); \n" +
" $(custom_on_update_text) \n" );
" '$(pkColumnNames)'); \n");

sqlTemplates.put("deleteTriggerTemplate" ,
"CREATE TRIGGER $(triggerName) \n" +
Expand All @@ -96,8 +94,7 @@ public DerbyTriggerTemplate(ISymmetricDialect symmetricDialect) {
" $(txIdExpression), \n" +
" $(externalSelect), \n" +
" '$(columnNames)', \n" +
" '$(pkColumnNames)'); \n" +
" $(custom_on_delete_text) \n" );
" '$(pkColumnNames)'); \n");


sqlTemplates.put("initialLoadSqlTemplate" ,
Expand Down
45 changes: 19 additions & 26 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/h2/H2TriggerTemplate.java
View file
Expand Up @@ -29,7 +29,7 @@ public class H2TriggerTemplate extends AbstractTriggerTemplate {

public H2TriggerTemplate(ISymmetricDialect symmetricDialect) {
super(symmetricDialect);

emptyColumnTemplate = "''''" ;
stringColumnTemplate = "case when $(tableAlias)\"$(columnName)\" is null then '''' else ''\"''||replace(replace($(tableAlias)\"$(columnName)\",''\\'',''\\\\''),''\"'',''\\\"'')||''\"'' end" ;
numberColumnTemplate = "case when $(tableAlias)\"$(columnName)\" is null then '''' else ''\"''||cast($(tableAlias)\"$(columnName)\" as varchar(50))||''\"'' end" ;
Expand All @@ -45,36 +45,29 @@ public H2TriggerTemplate(ISymmetricDialect symmetricDialect) {

sqlTemplates = new HashMap<String,String>();
sqlTemplates.put("insertTriggerTemplate" ,
"CREATE TABLE $(schemaName)$(triggerName)_CONFIG (CONDITION_SQL CLOB, INSERT_DATA_SQL CLOB); " +
" INSERT INTO $(schemaName)$(triggerName)_CONFIG values( " +
" 'select count(*) from $(virtualOldNewTable) where $(syncOnInsertCondition) and $(syncOnIncomingBatchCondition)', " +
" 'insert into $(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, row_data, channel_id, transaction_id, source_node_id, external_data, create_time)" +
" (select ''$(targetTableName)'',''I'',$(triggerHistoryId),$(columns), ''$(channelName)'', $(txIdExpression), @node_value, $(externalSelect), CURRENT_TIMESTAMP from $(virtualOldNewTable));" +
" $(custom_on_insert_text)' " +
" ); " +
" " +
"CREATE TABLE $(schemaName)$(triggerName)_CONFIG (CONDITION_SQL CLOB, INSERT_DATA_SQL CLOB); " +
" INSERT INTO $(schemaName)$(triggerName)_CONFIG values( " +
" 'select count(*) from $(virtualOldNewTable) where $(syncOnInsertCondition) and $(syncOnIncomingBatchCondition)', " +
" 'insert into $(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, row_data, channel_id, transaction_id, source_node_id, external_data, create_time)" +
" (select ''$(targetTableName)'',''I'',$(triggerHistoryId),$(columns), ''$(channelName)'', $(txIdExpression), @node_value, $(externalSelect), CURRENT_TIMESTAMP from $(virtualOldNewTable))' " +
" ); " +
" CREATE TRIGGER $(schemaName)$(triggerName) AFTER INSERT ON $(schemaName)$(tableName) FOR EACH ROW CALL \"org.jumpmind.symmetric.db.h2.H2Trigger\"; " );

sqlTemplates.put("updateTriggerTemplate" ,
"CREATE TABLE $(schemaName)$(triggerName)_CONFIG (CONDITION_SQL CLOB, INSERT_DATA_SQL CLOB); " +
" INSERT INTO $(schemaName)$(triggerName)_CONFIG values( " +
" 'select count(*) from $(virtualOldNewTable) where $(syncOnUpdateCondition) and $(syncOnIncomingBatchCondition)', " +
" 'insert into $(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, pk_data, row_data, old_data, channel_id, transaction_id, source_node_id, external_data, create_time)" +
" (select ''$(targetTableName)'',''U'',$(triggerHistoryId),$(oldKeys),$(columns),$(oldColumns), ''$(channelName)'', $(txIdExpression), @node_value, $(externalSelect), CURRENT_TIMESTAMP from $(virtualOldNewTable));" +
" $(custom_on_update_text)' " +
" ); " +
"CREATE TABLE $(schemaName)$(triggerName)_CONFIG (CONDITION_SQL CLOB, INSERT_DATA_SQL CLOB); " +
" INSERT INTO $(schemaName)$(triggerName)_CONFIG values( " +
" 'select count(*) from $(virtualOldNewTable) where $(syncOnUpdateCondition) and $(syncOnIncomingBatchCondition)', " +
" 'insert into $(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, pk_data, row_data, old_data, channel_id, transaction_id, source_node_id, external_data, create_time)" +
" (select ''$(targetTableName)'',''U'',$(triggerHistoryId),$(oldKeys),$(columns),$(oldColumns), ''$(channelName)'', $(txIdExpression), @node_value, $(externalSelect), CURRENT_TIMESTAMP from $(virtualOldNewTable))'" +
" ); " +
" CREATE TRIGGER $(schemaName)$(triggerName) AFTER UPDATE ON $(schemaName)$(tableName) FOR EACH ROW CALL \"org.jumpmind.symmetric.db.h2.H2Trigger\"; " );

sqlTemplates.put("deleteTriggerTemplate" ,
"CREATE TABLE $(schemaName)$(triggerName)_CONFIG (CONDITION_SQL CLOB, INSERT_DATA_SQL CLOB); " +
" INSERT INTO $(schemaName)$(triggerName)_CONFIG values( " +
" 'select count(*) from $(virtualOldNewTable) where $(syncOnDeleteCondition) and $(syncOnIncomingBatchCondition)', " +
" 'insert into $(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, pk_data, old_data, channel_id, transaction_id, source_node_id, external_data, create_time)" +
" (select ''$(targetTableName)'',''D'',$(triggerHistoryId),$(oldKeys),$(oldColumns),''$(channelName)'', $(txIdExpression), @node_value, $(externalSelect), CURRENT_TIMESTAMP from $(virtualOldNewTable));" +
" $(custom_on_delete_text)' " +
" ); " +
"CREATE TABLE $(schemaName)$(triggerName)_CONFIG (CONDITION_SQL CLOB, INSERT_DATA_SQL CLOB); " +
" INSERT INTO $(schemaName)$(triggerName)_CONFIG values( " +
" 'select count(*) from $(virtualOldNewTable) where $(syncOnDeleteCondition) and $(syncOnIncomingBatchCondition)', " +
" 'insert into $(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, pk_data, old_data, channel_id, transaction_id, source_node_id, external_data, create_time)" +
" (select ''$(targetTableName)'',''D'',$(triggerHistoryId),$(oldKeys),$(oldColumns),''$(channelName)'', $(txIdExpression), @node_value, $(externalSelect), CURRENT_TIMESTAMP from $(virtualOldNewTable))'" +
" ); " +
" CREATE TRIGGER $(schemaName)$(triggerName) AFTER DELETE ON $(schemaName)$(tableName) FOR EACH ROW CALL \"org.jumpmind.symmetric.db.h2.H2Trigger\"; " );

sqlTemplates.put("initialLoadSqlTemplate" ,
"select $(columns) from $(schemaName)$(tableName) t where $(whereClause) " );
}
Expand Down

0 comments on commit 3be0806

Please sign in to comment.