Skip to content

Commit

Permalink
0005188: Made some trigger templates use UTC time and replaced some i…
Browse files Browse the repository at this point in the history 
…nstances of current_timestamp
  • Loading branch information
@evan-miller-jumpmind
evan-miller-jumpmind committed Jan 21, 2022
1 parent 9a7598c commit c5a6a7c
Show file tree
Hide file tree
Showing 37 changed files with 194 additions and 158 deletions.
5 changes: 5 additions & 0 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSql2008TriggerTemplate.java
View file
Expand Up @@ -65,4 +65,9 @@ private String buildColumnsAreNotEqualString(Table table, String table1Name, Str
}
return builder.toString();
}

@Override
protected String getCreateTimeExpression() {
return "getutcdate()";
}
}
28 changes: 16 additions & 12 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlTriggerTemplate.java
View file
Expand Up @@ -92,7 +92,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" insert into " + defaultCatalog + "$(defaultSchema)$(prefixName)_data \n" +
" (table_name, event_type, trigger_hist_id, row_data, channel_id, transaction_id, source_node_id, external_data, create_time) \n" +
" select '$(targetTableName)','I', $(triggerHistoryId), $(columns), \n" +
" $(channelExpression), $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), current_timestamp \n" +
" $(channelExpression), $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), " + getCreateTimeExpression() + " \n" +
" $(if:containsBlobClobColumns) \n" +
" from inserted inner join $(schemaName)$(tableName) $(origTableAlias) on $(tableNewPrimaryKeyJoin) \n" +
" $(else:containsBlobClobColumns) \n" +
Expand Down Expand Up @@ -120,7 +120,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" insert into " + defaultCatalog + "$(defaultSchema)$(prefixName)_data \n" +
" (table_name, event_type, trigger_hist_id, pk_data, channel_id, transaction_id, source_node_id, external_data, create_time) \n" +
" select '$(targetTableName)','R', $(triggerHistoryId), $(newKeys), \n" +
" $(channelExpression), $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), current_timestamp \n" +
" $(channelExpression), $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), " + getCreateTimeExpression() + " \n" +
" $(if:containsBlobClobColumns) \n" +
" from inserted inner join $(schemaName)$(tableName) $(origTableAlias) on $(tableNewPrimaryKeyJoin) \n" +
" $(else:containsBlobClobColumns) \n" +
Expand Down Expand Up @@ -169,7 +169,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" select '$(targetTableName)','U', $(triggerHistoryId), $(columns), $(oldKeys), $(oldColumns), \n" +
" $(channelExpression), \n" +
" $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), \n" +
" current_timestamp \n" +
" " + getCreateTimeExpression() + " \n" +
" $(if:containsBlobClobColumns) \n" +
" from inserted \n" +
" inner join $(schemaName)$(tableName) $(origTableAlias) on $(tableNewPrimaryKeyJoin) \n" +
Expand All @@ -188,7 +188,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" select '$(targetTableName)','D', $(triggerHistoryId), $(oldKeys), \n" +
" $(specialSqlServerSybaseChannelExpression), $(txIdExpression), \n" +
defaultCatalog + "dbo.$(prefixName)_node_disabled(), \n" +
" $(externalSelect), current_timestamp \n" +
" $(externalSelect), " + getCreateTimeExpression() + " \n" +
" from deleted \n" +
" where $(syncOnDeleteCondition) \n" +
" insert into " + defaultCatalog + "$(defaultSchema)$(prefixName)_data \n" +
Expand All @@ -197,7 +197,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" select '$(targetTableName)','I', $(triggerHistoryId), $(columns), \n" +
" $(channelExpression), $(txIdExpression), \n" +
defaultCatalog + "dbo.$(prefixName)_node_disabled(), \n" +
" $(externalSelect), current_timestamp \n" +
" $(externalSelect), " + getCreateTimeExpression() + " \n" +
" $(if:containsBlobClobColumns) \n" +
" from inserted \n" +
" inner join $(schemaName)$(tableName) $(origTableAlias) on $(tableNewPrimaryKeyJoin) \n" +
Expand All @@ -216,7 +216,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" select '$(targetTableName)','U', $(triggerHistoryId), $(columns), $(oldKeys), $(oldColumns), \n" +
" $(channelExpression), \n" +
" $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), \n" +
" current_timestamp \n" +
" " + getCreateTimeExpression() + " \n" +
" $(if:containsBlobClobColumns) \n" +
" from inserted \n" +
" inner join $(schemaName)$(tableName) $(origTableAlias) on $(tableNewPrimaryKeyJoin) \n" +
Expand Down Expand Up @@ -263,7 +263,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" select '$(targetTableName)','U', $(triggerHistoryId), $(columns), $(oldKeys), $(oldColumns), \n" +
" $(channelExpression), \n" +
" $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), \n" +
" current_timestamp \n" +
" " + getCreateTimeExpression() + " \n" +
" $(if:containsBlobClobColumns) \n" +
" from inserted \n" +
" inner join $(schemaName)$(tableName) $(origTableAlias) on $(tableNewPrimaryKeyJoin) \n" +
Expand All @@ -282,7 +282,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" select '$(targetTableName)','D', $(triggerHistoryId), $(oldKeys), \n" +
" $(specialSqlServerSybaseChannelExpression), \n" +
" $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), \n" +
" $(externalSelect), current_timestamp \n" +
" $(externalSelect), " + getCreateTimeExpression() + " \n" +
" from deleted \n" +
" where $(syncOnDeleteCondition) \n" +
" insert into " + defaultCatalog + "$(defaultSchema)$(prefixName)_data \n" +
Expand All @@ -291,7 +291,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" select '$(targetTableName)','R', $(triggerHistoryId), $(newKeys), \n" +
" $(channelExpression), $(txIdExpression), \n" +
defaultCatalog + "dbo.$(prefixName)_node_disabled(), \n" +
" $(externalSelect), current_timestamp \n" +
" $(externalSelect), " + getCreateTimeExpression() + " \n" +
" $(if:containsBlobClobColumns) \n" +
" from inserted \n" +
" inner join $(schemaName)$(tableName) $(origTableAlias) on $(tableNewPrimaryKeyJoin) \n" +
Expand All @@ -308,7 +308,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" source_node_id, external_data, create_time) \n" +
" select '$(targetTableName)','R', $(triggerHistoryId), $(oldKeys), $(channelExpression), \n" +
" $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), \n" +
" $(externalSelect), current_timestamp \n" +
" $(externalSelect), " + getCreateTimeExpression() + " \n" +
" $(if:containsBlobClobColumns) \n" +
" from inserted \n" +
" inner join $(schemaName)$(tableName) $(origTableAlias) on $(tableNewPrimaryKeyJoin) \n" +
Expand Down Expand Up @@ -339,7 +339,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" if ($(syncOnIncomingBatchCondition)) begin \n" +
" insert into " + defaultCatalog + "$(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) \n" +
" select '$(targetTableName)','D', $(triggerHistoryId), $(oldKeys), $(oldColumns), $(channelExpression), \n" +
" $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), current_timestamp\n" +
" $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), " + getCreateTimeExpression() + "\n" +
" from deleted where $(syncOnDeleteCondition) \n" +
" end \n" +
" $(custom_on_delete_text) \n" +
Expand All @@ -364,7 +364,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
" (table_name, event_type, trigger_hist_id, row_data, channel_id, source_node_id, create_time)\n" +
" values ('$(prefixName)_node', '" + DataEventType.SQL.getCode() + "', @histId,\n" +
" '\"delimiter " + delimiter + ";' + CHAR(13) + char(10) + replace(replace(@data.value('(/EVENT_INSTANCE/TSQLCommand/CommandText)[1]', 'nvarchar(max)'),'\\','\\\\'),'\"','\\\"') + '\",ddl',\n" +
" 'config', dbo.$(prefixName)_node_disabled(), current_timestamp)\n" +
" 'config', dbo.$(prefixName)_node_disabled(), " + getCreateTimeExpression() + ")\n" +
"end\n" + "---- go");

sqlTemplates.put("initialLoadSqlTemplate" ,
Expand Down Expand Up @@ -457,6 +457,10 @@ protected String getSourceTablePrefix(TriggerHistory triggerHistory) {
}
return prefix;
}

protected String getCreateTimeExpression() {
return "current_timestamp";
}

@Override
protected String getColumnSize(Table table, Column column) {
Expand Down

0 comments on commit c5a6a7c

Please sign in to comment.