[CONJ-1202] Session variable setting must be executed last

mariadb-corporation · Oct 10, 2024 · b369ace · b369ace
1 parent 9b69c21
commit b369ace
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/client/impl/StandardClient.java b/src/main/java/org/mariadb/jdbc/client/impl/StandardClient.java
@@ -771,11 +771,6 @@ public String createSessionVariableQuery(Context context) {
               + "')");
     }
 
-    // add configured session variable if configured
-    if (conf.sessionVariables() != null) {
-      sessionCommands.add(Security.parseSessionVariables(conf.sessionVariables()));
-    }
-
     // force client timezone to connection to ensure result of now(), ...
     if (conf.forceConnectionTimeZoneToSession() == null
         || conf.forceConnectionTimeZoneToSession()) {
@@ -827,6 +822,11 @@ public String createSessionVariableQuery(Context context) {
       sessionCommands.add(defaultCharsetSet);
     }
 
+    // add configured session variable if configured
+    if (conf.sessionVariables() != null) {
+      sessionCommands.add(Security.parseSessionVariables(conf.sessionVariables()));
+    }
+
     if (!sessionCommands.isEmpty()) {
       return "set " + sessionCommands.stream().collect(Collectors.joining(","));
     }