Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Snowflake schema specified in :additional-options should take precedence (#82364)

technomancydaceb36e65bc
diff --git a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
index 4cb82f8a33e..3dbbf3d9aa1 100644
--- a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
+++ b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
@@ -265,6 +265,14 @@
(str/join "&" (remove #(re-matches #"(?i)enablePutGet(=.*)?" %)
(str/split additional-options #"&"))))))
+;; we used to have schema as a top-level key but it's been gone for a while now
+;; but there's no way to remove it; you can only set it in additional-options.
+;; so that method needs to take precedence.
+(defn- remove-schema-if-in-additional [{:keys [additional-options] :as details}]
+ (if (and additional-options (re-find #"schema=" additional-options))
+ (dissoc details :schema)
+ details))
+
(defmethod sql-jdbc.conn/connection-details->spec :snowflake
[_ {:keys [account additional-options host use-hostname password use-password], :as details}]
(when (get "week_start" (sql-jdbc.common/additional-options->map additional-options :url))
@@ -314,6 +322,7 @@
;; see https://github.com/metabase/metabase/issues/9511
(update :warehouse upcase-not-nil)
(m/update-existing :schema upcase-not-nil)
+ (remove-schema-if-in-additional)
resolve-private-key
(dissoc :host :port :timezone)))
(sql-jdbc.common/handle-additional-options (update details
diff --git a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
index 7ae0a1c6166..67d35460bd2 100644
--- a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
+++ b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
@@ -202,6 +202,12 @@
(let [spec (sql-jdbc.conn/connection-details->spec :snowflake (assoc details :additional-options opts))]
(is (= "false" (:enablePutGet spec)))
(is (not (re-find #"(?i)enablePutGet" (str (:subname spec))))))))
+ (testing "additional options wins over top-level schema"
+ ;; https://github.com/metabase/metabase/issues/65493
+ (let [details (assoc details :schema "BAD" :additional-options "schema=GOOD")
+ spec (sql-jdbc.conn/connection-details->spec :snowflake details)]
+ (is (nil? (:schema spec)))
+ (is (re-find #"schema=GOOD" (:subname spec)))))
(testing "Application parameter is set to identify Metabase connections"
(is (= "Metabase_Metabase"
(:application (sql-jdbc.conn/connection-details->spec :snowflake details)))))))