Skip to content

Commit 34ef273

Browse files
authored
set connectionTimeZone default to SERVER (#89)
* Set default `connectionTimeZone` parameter for MYSQL to `SERVER`
1 parent c796115 commit 34ef273

File tree

5 files changed

+11
-2
lines changed

5 files changed

+11
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 2.5.5 (May 20, 2022)
2+
* Set default `connectionTimeZone` parameter for MYSQL to `SERVER`
3+
14
## 2.5.4 (May 11, 2022)
25
* Made an automated vulnerability check run in CI/CD
36

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ dependencies {
7272
compile 'com.fasterxml.jackson.core:jackson-core:2.10.1'
7373
compile 'com.fasterxml.jackson.core:jackson-annotations:2.10.1'
7474
compile 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
75-
compile 'com.google.code.gson:gson:2.8.6'
75+
compile 'com.google.code.gson:gson:2.9.0'
7676
compile 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8'
7777
compile 'io.elastic:sailor-jvm:3.3.9'
7878
compile 'mysql:mysql-connector-java:8.0.29'

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "Database",
33
"description": "Database JDBC connector",
4-
"version": "2.5.4",
4+
"version": "2.5.5",
55
"credentials": {
66
"verifier": "io.elastic.jdbc.JdbcCredentialsVerifier",
77
"fields": {

src/main/java/io/elastic/jdbc/utils/Utils.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ private static Properties getConfigurationProperties(final JsonObject config,
101101
throw new RuntimeException(e);
102102
}
103103
}
104+
if (properties.getProperty("connectionTimeZone") == null && engineType == Engines.MYSQL) {
105+
properties.setProperty("connectionTimeZone", "SERVER");
106+
}
104107
properties.setProperty("user", user);
105108
properties.setProperty("password", password);
106109
return properties;

src/test/groovy/io/elastic/jdbc/unit/UtilsSpec.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class UtilsSpec extends Specification {
1616
.add("password", "password")
1717
.build();
1818
Properties expectedProperties = new Properties();
19+
expectedProperties.setProperty("connectionTimeZone", "SERVER")
1920
expectedProperties.setProperty("user", "user")
2021
expectedProperties.setProperty("password", "password")
2122
Properties properties = Utils.getConfigurationProperties(config, engineType)
@@ -31,6 +32,7 @@ class UtilsSpec extends Specification {
3132
.add("configurationProperties", "ssl=true")
3233
.build();
3334
Properties expectedProperties = new Properties();
35+
expectedProperties.setProperty("connectionTimeZone", "SERVER")
3436
expectedProperties.setProperty("user", "user")
3537
expectedProperties.setProperty("password", "password")
3638
expectedProperties.setProperty("ssl", "true")
@@ -47,6 +49,7 @@ class UtilsSpec extends Specification {
4749
.add("configurationProperties", "ssl=true&serverTimezone=UTC")
4850
.build();
4951
Properties expectedProperties = new Properties();
52+
expectedProperties.setProperty("connectionTimeZone", "SERVER")
5053
expectedProperties.setProperty("user", "user")
5154
expectedProperties.setProperty("password", "password")
5255
expectedProperties.setProperty("ssl", "true")

0 commit comments

Comments
 (0)