Skip to content

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

Send ClickHouse join_use_nulls only in tests (#85919)

Riley Thompson112ee5a0a73f
diff --git a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
index 9a51d8eff4d..93a13e3dbaa 100644
--- a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
+++ b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
@@ -178,8 +178,6 @@
:ignore_unknown_config_key true
:max_open_connections (or max-open-connections 100)
:custom_http_params (cond-> "select_sequential_consistency=1"
- (not (some->> clickhouse-settings (re-find #"(?:^|,)\s*join_use_nulls\s*=")))
- (str ",join_use_nulls=1")
(not (str/blank? clickhouse-settings))
(str "," clickhouse-settings))
:jdbc_metadata_use_show_statements false}
diff --git a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
index 7668b61c05d..c6adf4bf14c 100644
--- a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
+++ b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
@@ -400,7 +400,7 @@
:user "bob"
:password "qaz"
:ssl true
- :custom_http_params "select_sequential_consistency=1,join_use_nulls=1,max_threads=42,allow_experimental_analyzer=0"})
+ :custom_http_params "select_sequential_consistency=1,max_threads=42,allow_experimental_analyzer=0"})
(sql-jdbc.conn/connection-details->spec
:clickhouse
{:host "myclickhouse"
@@ -517,7 +517,7 @@
(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,join_use_nulls=1,max_result_rows=10,max_columns_to_read=20"
+ (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
@@ -946,3 +946,30 @@
(testing "a host written as a URL with a scheme and path is still allowed"
(is (nil? (driver.u/validate-connection-parameters!
:clickhouse {:host "https://ch.example.com/x" :port 8443 :dbname "d"})))))
+
+(deftest readonly-user-test
+ (mt/test-driver :clickhouse
+ (testing "A user with `readonly = 1` can run queries"
+ (try
+ (ctd/exec-statements ["CREATE SETTINGS PROFILE OR REPLACE metabase_readonly_profile SETTINGS
+ readonly = 1 READONLY,
+ select_sequential_consistency CHANGEABLE_IN_READONLY,
+ max_execution_time = 30 READONLY;"
+ "CREATE USER OR REPLACE metabase_readonly_user NOT IDENTIFIED
+ SETTINGS PROFILE metabase_readonly_profile;"]
+ {})
+ (mt/with-temp [:model/Database db {:engine :clickhouse
+ :details (-> (mt/dbdef->connection-details :clickhouse :db {:database-name "default"})
+ (dissoc :clickhouse-settings)
+ (assoc :user "metabase_readonly_user"))}]
+ (mt/with-db db
+ (is (= [[1 30]]
+ (->> (str "SELECT toInt64(getSetting('select_sequential_consistency')), "
+ "toInt64(getSetting('max_execution_time'))")
+ (lib/native-query (mt/metadata-provider))
+ qp/process-query
+ mt/rows)))))
+ (finally
+ (ctd/exec-statements ["DROP USER IF EXISTS metabase_readonly_user;"
+ "DROP SETTINGS PROFILE IF EXISTS metabase_readonly_profile;"]
+ {}))))))
diff --git a/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj b/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
index 341574085fa..59dae0396b2 100644
--- a/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
+++ b/modules/drivers/clickhouse/test/metabase/test/data/clickhouse.clj
@@ -58,7 +58,7 @@
:max_open_connections 100
:remember_last_set_roles true
:http_connection_provider "HTTP_URL_CONNECTION"
- :custom_http_params "select_sequential_consistency=1,join_use_nulls=1"})
+ :custom_http_params "select_sequential_consistency=1"})
(defmethod sql.tx/field-base-type->sql-type [:clickhouse :type/Boolean] [_ _] "Boolean")
(defmethod sql.tx/field-base-type->sql-type [:clickhouse :type/BigInteger] [_ _] "Int64")
@@ -84,6 +84,7 @@
{:user user})
(when-let [password (mt/db-test-env-var :clickhouse :password)]
{:password password})
+ {:clickhouse-settings "join_use_nulls=1"}
(when (= context :db)
(let [database-name (ddl.i/format-name driver database-name)]
{:db database-name