(nifi) branch support/nifi-1.x updated: NIFI-13837 QueryRecord changes timezones of Timestamp field

[mattyb149]

This is an automated email from the ASF dual-hosted git repository.

mattyb149 pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 1d2b662a5f NIFI-13837 QueryRecord changes timezones of Timestamp field
1d2b662a5f is described below

commit 1d2b662a5ffa09fd154ccace668668d4731bfbb3
Author: Mark Payne <marka...@hotmail.com>
AuthorDate: Tue Jul 9 17:01:41 2024 +0200

    NIFI-13837 QueryRecord changes timezones of Timestamp field
    
    Signed-off-by: Matt Burgess <mattyb...@apache.org>
    
    This closes #9341
---
 .../main/java/org/apache/nifi/reporting/sql/MetricsSqlQueryService.java  | 1 +
 .../src/main/java/org/apache/nifi/processors/standard/QueryRecord.java   | 1 +
 .../org/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);