The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Only use snowflake dbname value if db value is not present (#66534)
Riley Thompsonab51e0f700cf
diff --git a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj b/modules/drivers/snowflake/src/metabase/driver/snowflake.cljindex e73367a10a6..3908c05887e 100644--- a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj+++ b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj@@ -241,8 +241,10 @@(str account ".snowflakecomputing.com/"))](str "//" base-url)))));; original version of the Snowflake driver incorrectly used `dbname` in the details fields instead- ;; of `db`. If we run across `dbname`, correct our behavior- (set/rename-keys {:dbname :db})+ ;; of `db`. If we run across `dbname` without a `db`, correct our behavior+ (as-> dtls (if (contains? dtls :db)+ (dissoc dtls :dbname)+ (set/rename-keys dtls {:dbname :db})));; see https://github.com/metabase/metabase/issues/27856(update :db quote-name)(cond-> use-passworddiff --git a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.cljindex a8bd06132b7..3b4f5f2d9c8 100644--- a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj+++ b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj@@ -1421,3 +1421,25 @@(let [result (qp/process-query (collation-query collation))](is (str/includes? (-> result :data :native_form :query) exp-filter))(is (= exp-rows (mt/rows result))))))))++(deftest snowflake-with-dbname-in-details-gets-synced-test+ (testing "db with a valid db and an invalid dbname in details should be synced with db correctly"+ (mt/test-driver :snowflake+ (let [priv-key-val (mt/priv-key->base64-uri (tx/db-test-env-var-or-throw :snowflake :private-key))]+ (mt/with-temp [:model/Database db {:engine :snowflake+ :details (-> (:details (mt/db))+ (dissoc :private-key-id)+ (assoc :private-key-options "uploaded")+ (assoc :private-key-value priv-key-val)+ (assoc :use-password false)+ (assoc :dbname nil))}]+ (is (= {:tables+ #{{:name "users", :schema "PUBLIC", :description nil}+ {:name "venues", :schema "PUBLIC", :description nil}+ {:name "checkins", :schema "PUBLIC", :description nil}+ {:name "categories", :schema "PUBLIC", :description nil}+ {:name "orders", :schema "PUBLIC", :description nil}+ {:name "people", :schema "PUBLIC", :description nil}+ {:name "products", :schema "PUBLIC", :description nil}+ {:name "reviews", :schema "PUBLIC", :description nil}}}+ (driver/describe-database :snowflake db))))))))