From e2ab2573404b5b07ae4bdc32c27e5adf36adc490 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 15 Apr 2020 17:52:50 +0200
Subject: [PATCH] Update mysql connector/J and SCHEMA_VERSION
---
pom.xml | 2 +-
.../backend/implementation/MySQL/DatabaseConnectionPool.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 989f4837..236a3129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>6.0.6</version>
+ <version>8.0.19</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
diff --git a/src/main/java/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java b/src/main/java/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java
index 9700daf3..86918e37 100644
--- a/src/main/java/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java
+++ b/src/main/java/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java
@@ -85,7 +85,9 @@ class DatabaseConnectionPool {
+ CaosDBServer.getServerProperty(ServerProperties.KEY_MYSQL_PORT)
+ "/"
+ CaosDBServer.getServerProperty(ServerProperties.KEY_MYSQL_DATABASE_NAME)
- + "?noAccessToProcedureBodies=true&cacheCallableStmts=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&connectionCollation=utf8_unicode_ci&characterSetResults=utf8&serverTimezone=CET";
+ + "?noAccessToProcedureBodies=true&autoReconnect=true&serverTimezone=UTC&characterEncoding=UTF-8";
+ // +
+ // "?noAccessToProcedureBodies=true&cacheCallableStmts=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&connectionCollation=utf8_unicode_ci&characterSetResults=utf8&serverTimezone=CET";
// + "?profileSQL=true&characterSetResults=utf8";
final String user = CaosDBServer.getServerProperty(ServerProperties.KEY_MYSQL_USER_NAME);
final String pwd = CaosDBServer.getServerProperty(ServerProperties.KEY_MYSQL_USER_PASSWORD);
--
GitLab