Skip to content

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

Bump clickhouse versions to 26.9 / 0.11.0 (#85267)

technomancy9850d97af778
diff --git a/modules/drivers/clickhouse/deps.edn b/modules/drivers/clickhouse/deps.edn
index fe97d282117..d241be7a616 100644
--- a/modules/drivers/clickhouse/deps.edn
+++ b/modules/drivers/clickhouse/deps.edn
@@ -1,6 +1,6 @@
{:paths ["src" "resources"]
:deps
- {com.clickhouse/clickhouse-jdbc {:mvn/version "0.9.8"
+ {com.clickhouse/clickhouse-jdbc {:mvn/version "0.11.0"
:exclusions [org.apache.commons/commons-lang3
org.lz4/lz4-java
;; pinned in and resolved from /deps.edn
diff --git a/modules/drivers/clickhouse/docker-compose.yml b/modules/drivers/clickhouse/docker-compose.yml
index 51a07e04772..ad85915bed7 100644
--- a/modules/drivers/clickhouse/docker-compose.yml
+++ b/modules/drivers/clickhouse/docker-compose.yml
@@ -1,5 +1,5 @@
# Keep the current-version ClickHouse services on the same image.
-x-clickhouse-image: &clickhouse-image 'clickhouse/clickhouse-server:26.8-alpine'
+x-clickhouse-image: &clickhouse-image 'clickhouse/clickhouse-server:latest-alpine'
services:
diff --git a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
index 1da981ecd48..4970b81763e 100644
--- a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
+++ b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
@@ -168,6 +168,7 @@
(str/starts-with? host "http://") (subs host 7)
(str/starts-with? host "https://") (subs host 8)
:else host)]
+ ;; https://clickhouse.com/docs/integrations/language-clients/java/jdbc
(-> {:classname "com.clickhouse.jdbc.ClickHouseDriver"
:subprotocol "clickhouse"
:subname (str "//" host ":" port "/" dbname)
@@ -182,10 +183,10 @@
: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"
(not (str/blank? clickhouse-settings))
- (str "," clickhouse-settings))}
+ (str "," clickhouse-settings))
+ :jdbc_metadata_use_show_statements false}
(sql-jdbc.common/handle-additional-options details :separator-style :url))))
(defmethod driver/database-supports? [:clickhouse :uploads] [_driver _feature db]
diff --git a/modules/drivers/clickhouse/test/metabase/driver/clickhouse/index_test.clj b/modules/drivers/clickhouse/test/metabase/driver/clickhouse/index_test.clj
index 4dabd0d7911..63798fb29c3 100644
--- a/modules/drivers/clickhouse/test/metabase/driver/clickhouse/index_test.clj
+++ b/modules/drivers/clickhouse/test/metabase/driver/clickhouse/index_test.clj
@@ -253,7 +253,7 @@
(driver/execute-raw-queries! :clickhouse admin-spec
(driver/compile-create-index :clickhouse nil table index))
(testing "the catalog table the old read used is denied to this user"
- (is (thrown-with-msg? Exception #"ACCESS_DENIED"
+ (is (thrown-with-msg? Exception #"(ACCESS_DENIED|403)"
(jdbc/query reader-spec ["SELECT count() FROM system.data_skipping_indices"]))))
(testing "fetch-table-indexes still reads both index kinds"
(is (=? [{:name "evt_minmax" :kind :skip-index :access-method "minmax" :key-columns ["a"]}
diff --git a/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj b/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
index e28bb96cb09..e80e24dd8b9 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",
+ :jdbc_metadata_use_show_statements false,
:ignore_unknown_config_key true
:max_open_connections 100
:remember_last_set_roles true