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
Get default port from nested connection properties (#70713)
Riley Thompson3e655a0bb25d
diff --git a/src/metabase/driver/sql_jdbc/connection.clj b/src/metabase/driver/sql_jdbc/connection.cljindex 1ad4c58b269..fb387ae9814 100644--- a/src/metabase/driver/sql_jdbc/connection.clj+++ b/src/metabase/driver/sql_jdbc/connection.clj@@ -1,7 +1,7 @@(ns metabase.driver.sql-jdbc.connection"Logic for creating and managing connection pools for SQL JDBC drivers. Implementations for connection-related drivermultimethods for SQL JDBC drivers."- (:refer-clojure :exclude [get-in some select-keys])+ (:refer-clojure :exclude [get-in select-keys])(:require[clojure.java.jdbc :as jdbc][metabase.driver :as driver]@@ -15,7 +15,7 @@[metabase.util.i18n :refer [tru]][metabase.util.log :as log][metabase.util.malli :as mu]- [metabase.util.performance :refer [get-in select-keys some]]+ [metabase.util.performance :refer [get-in select-keys]][potemkin :as p]^{:clj-kondo/ignore [:discouraged-namespace]}[toucan2.core :as t2])@@ -174,9 +174,8 @@(driver-api/connection-pool-spec spec pool-properties)))(defn ^:private default-ssh-tunnel-target-port [driver]- (when-let [port-info (some- #(when (= "port" (:name %)) %)- (driver/connection-properties driver))]+ (let [conn-props (driver.u/collect-all-props-by-name (driver/connection-properties driver))+ port-info (get conn-props "port")](or (:default port-info)(:placeholder port-info))))diff --git a/test/metabase/driver/sql_jdbc/connection_test.clj b/test/metabase/driver/sql_jdbc/connection_test.cljindex 353eb9a32b1..50e2a01b0a6 100644--- a/test/metabase/driver/sql_jdbc/connection_test.clj+++ b/test/metabase/driver/sql_jdbc/connection_test.clj@@ -988,3 +988,20 @@(let [pool-2 (sql-jdbc.conn/db->pooled-connection-spec db)](is (= 1 @create-count) "Pool should be reused, not recreated")(is (identical? pool-1 pool-2) "Should be the same pool instance")))))))))++(defmulti has-default-port?+ "Whether a driver has a default port"+ {:arglists '([driver])}+ tx/dispatch-on-driver-with-test-extensions+ :hierarchy #'driver/hierarchy)++(defmethod has-default-port? :default [_driver] true)++(doseq [driver [:h2 :athena :databricks :snowflake :sqlite :sqlserver]]+ (defmethod has-default-port? driver [_driver] false))++(deftest ^:parallel default-ssh-tunnel-target-port-test+ (mt/test-drivers (mt/normal-driver-select {:+parent :sql-jdbc :+fns [has-default-port?]})+ (is (integer? (#'sql-jdbc.conn/default-ssh-tunnel-target-port driver/*driver*))))+ (mt/test-drivers (mt/normal-driver-select {:+parent :sql-jdbc :-fns [has-default-port?]})+ (is (nil? (#'sql-jdbc.conn/default-ssh-tunnel-target-port driver/*driver*)))))diff --git a/test/metabase/test/data.clj b/test/metabase/test/data.cljindex 94729baa25d..8e977bf0d03 100644--- a/test/metabase/test/data.clj+++ b/test/metabase/test/data.clj@@ -344,7 +344,10 @@(for [driver (tx.env/test-drivers):let [driver (tx/the-driver-with-test-extensions driver)conn-prop-names (when (or (seq +conn-props) (seq -conn-props))- (into #{} (map :name (driver/connection-properties driver))))]+ (->> (driver/connection-properties driver)+ driver.u/collect-all-props-by-name+ keys+ (into #{})))]:when (driver/with-driver driver(let [the-db (delay (db))](cond-> true