Skip to content

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

Ignore unknown settings in clickhouse (#70799)

Riley Thompson4fd189509fe9
diff --git a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
index 457b99bb5eb..272b54e2160 100644
--- a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
+++ b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
@@ -123,6 +123,7 @@
:http_connection_provider "HTTP_URL_CONNECTION"
:jdbc_ignore_unsupported_values "true"
:jdbc_schema_term "schema"
+ :ignore_unknown_config_key true
:max_open_connections (or max-open-connections 100)
;; see also: https://clickhouse.com/docs/en/integrations/java#configuration
:custom_http_params (cond-> "select_sequential_consistency=1"
diff --git a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
index ebdb4b79466..c85a873bb82 100644
--- a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
+++ b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
@@ -169,6 +169,29 @@
(mt/dbdef->connection-details :clickhouse :db {:database-name database}))]
(is (true? (driver/can-connect? :clickhouse details)))))))))
+(deftest ^:parallel clickhouse-additional-options-test
+ (testing "additional options not prefixed with `clickhouse_setting_` are moved to custom_http_params (#70777)"
+ (mt/test-driver :clickhouse
+ (let [details (assoc (:details (mt/db))
+ :additional-options "clickhouse_setting_max_threads=5&max_block_size=50"
+ :clickhouse-settings "max_result_rows=10,max_columns_to_read=20")
+ spec (sql-jdbc.conn/connection-details->spec :clickhouse details)]
+ (is (true? (driver/can-connect? :clickhouse details)))
+ (is (= "//localhost:8123/default?clickhouse_setting_max_threads=5&max_block_size=50"
+ (:subname spec)))
+ (is (= "select_sequential_consistency=1,max_result_rows=10,max_columns_to_read=20"
+ (:custom_http_params spec)))
+ (is (= {:max_threads 5
+ :max_block_size 65409 ;; unknown key is ignored
+ :max_results_rows 10
+ :max_columns_to_read 20}
+ (->> ["SELECT getSetting('max_threads') as max_threads,
+ getSetting('max_block_size') as max_block_size,
+ getSetting('max_result_rows') as max_results_rows,
+ getSetting('max_columns_to_read') as max_columns_to_read;"]
+ (jdbc/query spec)
+ first)))))))
+
(deftest clickhouse-qp-extract-datetime-timezone
(mt/test-driver :clickhouse
(is (= "utc" (#'clickhouse-qp/extract-datetime-timezone "datetime('utc')")))
diff --git a/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj b/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
index f01634906c5..df6097df561 100644
--- a/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
+++ b/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
@@ -53,6 +53,7 @@
:product_name (format "metabase/%s" (:tag config/mb-version-info))
:jdbc_ignore_unsupported_values "true"
:jdbc_schema_term "schema",
+ :ignore_unknown_config_key true
:max_open_connections 100
:remember_last_set_roles true
:http_connection_provider "HTTP_URL_CONNECTION"