From 1d2b662a5ffa09fd154ccace668668d4731bfbb3 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Tue, 9 Jul 2024 17:01:41 +0200 Subject: [PATCH] NIFI-13837 QueryRecord changes timezones of Timestamp field Signed-off-by: Matt Burgess This closes #9341 --- .../org/apache/nifi/reporting/sql/MetricsSqlQueryService.java | 1 + .../java/org/apache/nifi/processors/standard/QueryRecord.java | 1 + .../apache/nifi/processors/standard/enrichment/SqlJoinCache.java | 1 + 3 files changed, 3 insertions(+) diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/MetricsSqlQueryService.java b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/MetricsSqlQueryService.java index 867b9038bf..ba53b67fa9 100644 --- a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/MetricsSqlQueryService.java +++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/MetricsSqlQueryService.java @@ -188,6 +188,7 @@ public class MetricsSqlQueryService implements MetricsQueryService { private CalciteConnection createConnection() { final Properties properties = new Properties(); properties.put(CalciteConnectionProperty.LEX.camelName(), Lex.MYSQL_ANSI.name()); + properties.put(CalciteConnectionProperty.TIME_ZONE, "UTC"); try { final Connection connection = DriverManager.getConnection("jdbc:calcite:", properties); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java index ed8f553e95..b2dae20136 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java @@ -417,6 +417,7 @@ public class QueryRecord extends AbstractProcessor { private CalciteConnection createConnection() { final Properties properties = new Properties(); properties.put(CalciteConnectionProperty.LEX.camelName(), Lex.MYSQL_ANSI.name()); + properties.put(CalciteConnectionProperty.TIME_ZONE, "UTC"); try { final Connection connection = DriverManager.getConnection("jdbc:calcite:", properties); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/SqlJoinCache.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/SqlJoinCache.java index a53f21a7e2..a21975e66c 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/SqlJoinCache.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/SqlJoinCache.java @@ -95,6 +95,7 @@ public class SqlJoinCache implements AutoCloseable { private CalciteConnection createCalciteConnection() { final Properties properties = new Properties(); properties.put(CalciteConnectionProperty.LEX.camelName(), Lex.MYSQL_ANSI.name()); + properties.put(CalciteConnectionProperty.TIME_ZONE, "UTC"); try { final Connection connection = DriverManager.getConnection("jdbc:calcite:", properties);