diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
index e18ef49325cead14bbf46409185b3ad30ecc22a8..bfda3a1d1fc85bc9f829249c9bc01d47390ed0ed 100644
--- a/src/metabase/driver/mysql.clj
+++ b/src/metabase/driver/mysql.clj
@@ -6,6 +6,7 @@
[clojure.tools.logging :as log]
[honeysql.core :as hsql]
[java-time :as t]
+ [metabase.config :as config]
[metabase.db.spec :as dbspec]
[metabase.driver :as driver]
[metabase.driver.common :as driver.common]
@@ -317,16 +318,28 @@
;; GZIP compress packets sent between Metabase server and MySQL/MariaDB database
:useCompression true})
+(defn- maybe-add-program-name-option [jdbc-spec additional-options-map]
+ ;; connectionAttributes (if multiple) are separated by commas, so values that contain spaces are OK, so long as they
+ ;; don't contain a comma; our mb-version-and-process-identifier shouldn't contain one, but just to be on the safe side
+ (let [set-prog-nm-fn (fn []
+ (let [prog-name (str/replace config/mb-version-and-process-identifier "," "_")]
+ (assoc jdbc-spec :connectionAttributes (str "program_name:" prog-name))))]
+ (if-let [conn-attrs (get additional-options-map "connectionAttributes")]
+ (if (str/includes? conn-attrs "program_name")
+ jdbc-spec ; additional-options already includes the program_name; don't set it here
+ (set-prog-nm-fn))
+ (set-prog-nm-fn)))) ; additional-options did not contain connectionAttributes at all; set it
+
(defmethod sql-jdbc.conn/connection-details->spec :mysql
[_ {ssl? :ssl, :keys [additional-options ssl-cert], :as details}]
;; In versions older than 0.32.0 the MySQL driver did not correctly save `ssl?` connection status. Users worked
;; around this by including `useSSL=true`. Check if that's there, and if it is, assume SSL status. See #9629
;;
;; TODO - should this be fixed by a data migration instead?
- (let [ssl? (or ssl? (some-> additional-options (str/includes? "useSSL=true")))
- ssl-cert? (and ssl? (some? ssl-cert))]
- (when (and ssl?
- (not (some-> additional-options (str/includes? "trustServerCertificate"))))
+ (let [addl-opts-map (sql-jdbc.common/additional-options->map additional-options :url "=" false)
+ ssl? (or ssl? (= "true" (get addl-opts-map "useSSL")))
+ ssl-cert? (and ssl? (some? ssl-cert))]
+ (when (and ssl? (not (contains? addl-opts-map "trustServerCertificate")))
(log/info (trs "You may need to add 'trustServerCertificate=true' to the additional connection options to connect with SSL.")))
(merge
default-connection-args
@@ -336,6 +349,7 @@
(set/rename-keys {:dbname :db})
(dissoc :ssl))]
(-> (dbspec/mysql details)
+ (maybe-add-program-name-option addl-opts-map)
(sql-jdbc.common/handle-additional-options details))))))
(defmethod sql-jdbc.sync/active-tables :mysql
diff --git a/src/metabase/driver/sql_jdbc/common.clj b/src/metabase/driver/sql_jdbc/common.clj
index d1eb3a8ff8f39b206ff05dc635ffa0ceba50e1d6..60b46473d7cedc4419a9dae5b926f405dc4c3f09 100644
--- a/src/metabase/driver/sql_jdbc/common.clj
+++ b/src/metabase/driver/sql_jdbc/common.clj
@@ -72,12 +72,14 @@
(or (nil? name-value-separator?) (and (string? name-value-separator?)
(= 1 (count name-value-separator?))))
(or (nil? lowercase-keys?) (boolean? lowercase-keys?))]}
- (let [entry-sep (separator-style->entry-separator separator-style)
- nv-sep (or name-value-separator? default-name-value-separator)
- pairs (str/split additional-options (re-pattern entry-sep))
- k-fn (if (or (nil? lowercase-keys?) (false? lowercase-keys?)) str/lower-case identity)
- kv-fn (fn [part]
- (let [[k v] (str/split part (re-pattern (str "\\" nv-sep)))]
- [(k-fn k) v]))
- kvs (map kv-fn pairs)]
- (into {} kvs)))
+ (if (str/blank? additional-options)
+ {}
+ (let [entry-sep (separator-style->entry-separator separator-style)
+ nv-sep (or name-value-separator? default-name-value-separator)
+ pairs (str/split additional-options (re-pattern entry-sep))
+ k-fn (if (or (nil? lowercase-keys?) (true? lowercase-keys?)) str/lower-case identity)
+ kv-fn (fn [part]
+ (let [[k v] (str/split part (re-pattern (str "\\" nv-sep)))]
+ [(k-fn k) v]))
+ kvs (map kv-fn pairs)]
+ (into {} kvs))))
diff --git a/test/metabase/driver/mysql_test.clj b/test/metabase/driver/mysql_test.clj
index 423176ddfcc845adce9ea2e5d7bc64e324109ff2..f4366bfb934b473b7f97ac28563d30592822482d 100644
--- a/test/metabase/driver/mysql_test.clj
+++ b/test/metabase/driver/mysql_test.clj
@@ -4,6 +4,7 @@
[clojure.test :refer :all]
[honeysql.core :as hsql]
[java-time :as t]
+ [metabase.config :as config]
[metabase.db.metadata-queries :as metadata-queries]
[metabase.driver :as driver]
[metabase.driver.mysql :as mysql]
@@ -193,6 +194,7 @@
:zeroDateTimeBehavior "convertToNull"
:user "cam"
:subname "//localhost:3306/my_db"
+ :connectionAttributes (str "program_name:" config/mb-version-and-process-identifier)
:useCompression true
:useUnicode true})
@@ -207,11 +209,21 @@
(sql-jdbc.conn/connection-details->spec :mysql sample-connection-details))))
(testing "Connections that are `:ssl false` but with `useSSL` in the additional options should be treated as SSL (see #9629)"
- (is (= (assoc sample-jdbc-spec :useSSL true, :subname "//localhost:3306/my_db?useSSL=true&trustServerCertificate=true")
+ (is (= (assoc sample-jdbc-spec :useSSL true
+ :subname "//localhost:3306/my_db?useSSL=true&trustServerCertificate=true")
(sql-jdbc.conn/connection-details->spec :mysql
(assoc sample-connection-details
:ssl false
- :additional-options "useSSL=true&trustServerCertificate=true"))))))
+ :additional-options "useSSL=true&trustServerCertificate=true")))))
+ (testing "A program_name specified in additional-options is not overwritten by us"
+ (let [conn-attrs "connectionAttributes=program_name:my_custom_value"]
+ (is (= (-> sample-jdbc-spec
+ (assoc :subname (str "//localhost:3306/my_db?" conn-attrs), :useSSL false)
+ ;; because program_name was in additional-options, we shouldn't use emit :connectionAttributes
+ (dissoc :connectionAttributes))
+ (sql-jdbc.conn/connection-details->spec
+ :mysql
+ (assoc sample-connection-details :additional-options conn-attrs)))))))
(deftest read-timediffs-test
(mt/test-driver :mysql