From b3d03fea0ad24ed8eb4dd440823a6f6ce9b703b6 Mon Sep 17 00:00:00 2001 From: Eric Long Date: Tue, 28 Jun 2022 15:49:06 -0400 Subject: [PATCH] 0005188: back out utc create_time for now --- .../symmetric/db/mssql/MsSql2008TriggerTemplate.java | 5 ----- .../symmetric/db/mysql/MySqlTriggerTemplate.java | 10 +++++----- .../symmetric/db/oracle/OracleTriggerTemplate.java | 2 +- .../db/postgresql/PostgreSqlTriggerTemplate.java | 2 +- .../symmetric/db/sqlite/SqliteTriggerTemplate.java | 10 +++++----- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSql2008TriggerTemplate.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSql2008TriggerTemplate.java index a42d62d772..cc1dae8244 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSql2008TriggerTemplate.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSql2008TriggerTemplate.java @@ -65,9 +65,4 @@ private String buildColumnsAreNotEqualString(Table table, String table1Name, Str } return builder.toString(); } - - @Override - protected String getCreateTimeExpression() { - return "getutcdate()"; - } } diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlTriggerTemplate.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlTriggerTemplate.java index fa234b0f7b..c32cb9db9c 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlTriggerTemplate.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlTriggerTemplate.java @@ -60,7 +60,7 @@ public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect, boolean isConver " ), \n" + " $(channelExpression), $(txIdExpression), @sync_node_disabled, \n" + " $(externalSelect), \n" + -" UTC_TIMESTAMP() \n" + +" CURRENT_TIMESTAMP \n" + " ); \n" + " end if; \n" + " $(custom_on_insert_text) \n" + @@ -79,7 +79,7 @@ public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect, boolean isConver " concat($(newKeys)), \n" + " $(channelExpression), $(txIdExpression), @sync_node_disabled, \n" + " $(externalSelect), \n" + -" UTC_TIMESTAMP() \n" + +" CURRENT_TIMESTAMP \n" + " ); \n" + " end if; \n" + " $(custom_on_insert_text) \n" + @@ -106,7 +106,7 @@ public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect, boolean isConver " var_old_data, \n" + " $(channelExpression), $(txIdExpression), @sync_node_disabled, \n" + " $(externalSelect), \n" + -" UTC_TIMESTAMP() \n" + +" CURRENT_TIMESTAMP \n" + " ); \n" + " end if; \n" + " end if; \n" + @@ -128,7 +128,7 @@ public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect, boolean isConver " ), \n" + " $(channelExpression), $(txIdExpression), @sync_node_disabled, \n" + " $(externalSelect), \n" + -" UTC_TIMESTAMP() \n" + +" CURRENT_TIMESTAMP \n" + " ); \n" + " end if; \n" + " end if; \n" + @@ -151,7 +151,7 @@ public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect, boolean isConver " ), \n" + " $(channelExpression), $(txIdExpression), @sync_node_disabled, \n" + " $(externalSelect), \n" + -" UTC_TIMESTAMP() \n" + +" CURRENT_TIMESTAMP \n" + " ); \n" + " end if; \n" + " $(custom_on_delete_text) \n" + diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleTriggerTemplate.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleTriggerTemplate.java index b2b44eb12d..a33c26489d 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleTriggerTemplate.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleTriggerTemplate.java @@ -262,7 +262,7 @@ protected final String getNumberConversionString() { protected final String getCreateTimeExpression(ISymmetricDialect symmetricDialect) { String timezone = symmetricDialect.getParameterService().getString(ParameterConstants.DATA_CREATE_TIME_TIMEZONE); if (StringUtils.isEmpty(timezone)) { - return "CURRENT_TIMESTAMP AT TIME ZONE '0:0'"; + return "CURRENT_TIMESTAMP"; } else { return String.format("CURRENT_TIMESTAMP AT TIME ZONE '%s'", timezone); } diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlTriggerTemplate.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlTriggerTemplate.java index 7cca4b8243..9e7490d14b 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlTriggerTemplate.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlTriggerTemplate.java @@ -231,7 +231,7 @@ protected boolean requiresWrappedBlobTemplateForBlobType() { protected final String getCreateTimeExpression(ISymmetricDialect symmetricDialect) { String timezone = symmetricDialect.getParameterService().getString(ParameterConstants.DATA_CREATE_TIME_TIMEZONE); if (StringUtils.isEmpty(timezone)) { - return "CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; + return "CURRENT_TIMESTAMP"; } else { return String.format("CURRENT_TIMESTAMP AT TIME ZONE '%s'", timezone); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteTriggerTemplate.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteTriggerTemplate.java index 0e82eb0fbb..603b724848 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteTriggerTemplate.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteTriggerTemplate.java @@ -68,7 +68,7 @@ public SqliteTriggerTemplate(AbstractSymmetricDialect symmetricDialect) { + " values( \n" + " '$(targetTableName)', \n" + " 'I', \n" + " $(triggerHistoryId), \n" + " $(columns), \n" + " $(channelExpression), null," + sourceNodeExpression + ", \n" - + " $(externalSelect), \n" + " strftime('%Y-%m-%d %H:%M:%f','now') \n" + " ); \n" + + " $(externalSelect), \n" + " strftime('%Y-%m-%d %H:%M:%f','now','localtime') \n" + " ); \n" + " $(custom_on_insert_text) \n" + "end"); sqlTemplates @@ -81,7 +81,7 @@ public SqliteTriggerTemplate(AbstractSymmetricDialect symmetricDialect) { + " values( \n" + " '$(targetTableName)', \n" + " 'R', \n" + " $(triggerHistoryId), \n" + " $(newKeys), \n" + " $(channelExpression), null," + sourceNodeExpression + ", \n" - + " $(externalSelect), \n" + " strftime('%Y-%m-%d %H:%M:%f','now') \n" + " ); \n" + + " $(externalSelect), \n" + " strftime('%Y-%m-%d %H:%M:%f','now','localtime') \n" + " ); \n" + " $(custom_on_insert_text) \n" + "end"); sqlTemplates @@ -95,7 +95,7 @@ public SqliteTriggerTemplate(AbstractSymmetricDialect symmetricDialect) { + " $(triggerHistoryId), \n" + " $(oldKeys), \n" + " $(columns), \n" + " $(oldColumns), \n" + " $(channelExpression), null," + sourceNodeExpression + ", \n" + " $(externalSelect), \n" - + " strftime('%Y-%m-%d %H:%M:%f','now') \n" + " ); \n" + + " strftime('%Y-%m-%d %H:%M:%f','now','localtime') \n" + " ); \n" + " $(custom_on_update_text) \n" + "end "); sqlTemplates @@ -108,7 +108,7 @@ public SqliteTriggerTemplate(AbstractSymmetricDialect symmetricDialect) { + " values( \n" + " '$(targetTableName)', \n" + " 'R', \n" + " $(triggerHistoryId), \n" + " $(oldKeys), \n" + " $(channelExpression), null," + sourceNodeExpression + ", \n" + " $(externalSelect), \n" - + " strftime('%Y-%m-%d %H:%M:%f','now') \n" + " ); \n" + + " strftime('%Y-%m-%d %H:%M:%f','now','localtime') \n" + " ); \n" + " $(custom_on_update_text) \n" + "end "); sqlTemplates @@ -121,7 +121,7 @@ public SqliteTriggerTemplate(AbstractSymmetricDialect symmetricDialect) { + " values( \n" + " '$(targetTableName)', \n" + " 'D', \n" + " $(triggerHistoryId), \n" + " $(oldKeys), \n" + " $(oldColumns), \n" + " $(channelExpression), null," + sourceNodeExpression + ", \n" - + " $(externalSelect), \n" + " strftime('%Y-%m-%d %H:%M:%f','now') \n" + " ); \n" + + " $(externalSelect), \n" + " strftime('%Y-%m-%d %H:%M:%f','now','localtime') \n" + " ); \n" + " $(custom_on_delete_text) \n" + "end"); sqlTemplates.put("initialLoadSqlTemplate",