Skip to content

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

Finish mbql5 compilation for more drivers (#76549)

Riley Thompson2d7ed5407610
diff --git a/modules/drivers/athena/src/metabase/driver/athena.clj b/modules/drivers/athena/src/metabase/driver/athena.clj
index 3a42766bb48..73e263ba329 100644
--- a/modules/drivers/athena/src/metabase/driver/athena.clj
+++ b/modules/drivers/athena/src/metabase/driver/athena.clj
@@ -28,7 +28,7 @@
(set! *warn-on-reflection* true)
-(driver/register! :athena, :parent #{:sql-jdbc})
+(driver/register! :athena, :parent #{:sql-mbql5 :sql-jdbc})
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | metabase.driver method impls |
@@ -151,8 +151,8 @@
((get-method sql-jdbc.execute/read-column-thunk [:sql-jdbc Types/OTHER]) driver rs rsmeta i)))
(defmethod sql.qp/->honeysql [:athena ::sql.qp/cast-to-text]
- [driver [_ expr]]
- (sql.qp/->honeysql driver [::sql.qp/cast expr "varchar"]))
+ [driver [_ _opts expr]]
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver ::sql.qp/cast expr "varchar")))
(defmethod sql-jdbc.execute/read-column-thunk [:athena Types/TIMESTAMP_WITH_TIMEZONE]
[_driver ^ResultSet rs _rs-meta ^Long i]
@@ -332,7 +332,7 @@
[:date_parse expr (h2x/literal "%Y%m%d%H%i%S")])
(defmethod sql.qp/->honeysql [:athena :datetime-diff]
- [driver [_ x y unit]]
+ [driver [_ _opts x y unit]]
(let [x (sql.qp/->honeysql driver x)
y (sql.qp/->honeysql driver y)]
(case unit
@@ -343,15 +343,15 @@
;; Support for median/percentile functions
(defmethod sql.qp/->honeysql [:athena :median]
- [driver [_ arg]]
+ [driver [_ _opts arg]]
[:approx_percentile (sql.qp/->honeysql driver arg) 0.5])
(defmethod sql.qp/->honeysql [:athena :percentile]
- [driver [_ arg p]]
+ [driver [_ _opts arg p]]
[:approx_percentile (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver p)])
(defmethod sql.qp/->honeysql [:athena :regex-match-first]
- [driver [_ arg pattern]]
+ [driver [_ _opts arg pattern]]
[:regexp_extract (sql.qp/->honeysql driver arg) pattern])
(defn- run-query
diff --git a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
index ff5dbe5eff4..f9f52d002f3 100644
--- a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
+++ b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
@@ -32,7 +32,7 @@
(set! *warn-on-reflection* true)
(System/setProperty "clickhouse.jdbc.v2" "true")
-(driver/register! :clickhouse :parent #{:sql-jdbc})
+(driver/register! :clickhouse :parent #{:sql-mbql5 :sql-jdbc})
(defmethod driver/display-name :clickhouse [_] "ClickHouse")
diff --git a/modules/drivers/clickhouse/src/metabase/driver/clickhouse_qp.clj b/modules/drivers/clickhouse/src/metabase/driver/clickhouse_qp.clj
index 987e0e4f179..a0bf92890f7 100644
--- a/modules/drivers/clickhouse/src/metabase/driver/clickhouse_qp.clj
+++ b/modules/drivers/clickhouse/src/metabase/driver/clickhouse_qp.clj
@@ -202,7 +202,7 @@
;;; ------------------------------------------------------------------------------------
(defmethod sql.qp/->honeysql [:clickhouse :convert-timezone]
- [driver [_ arg target-timezone source-timezone]]
+ [driver [_ _opts arg target-timezone source-timezone]]
(let [expr (sql.qp/->honeysql driver (cond-> arg (string? arg) u.date/parse))
with-tz-info? (or (sql.qp.u/field-with-tz? arg)
(h2x/is-of-type? expr #"(?:nullable\(|lowcardinality\()?(datetime64\(\d, {0,1}'.*|datetime\(.*)"))
@@ -275,10 +275,10 @@
(driver-api/is-clause? :interval expr))
(defmethod sql.qp/->honeysql [:clickhouse :+]
- [driver [_ & args]]
+ [driver [_ _opts & args]]
(if (some interval? args)
(if-let [[field intervals] (u/pick-first (complement interval?) args)]
- (reduce (fn [hsql-form [_ amount unit]]
+ (reduce (fn [hsql-form [_ _opts amount unit]]
(sql.qp/add-interval-honeysql-form driver hsql-form amount unit))
(sql.qp/->honeysql driver field)
intervals)
@@ -286,19 +286,19 @@
(into [:+] (args->float64 args))))
(defmethod sql.qp/->honeysql [:clickhouse :log]
- [driver [_ field]]
+ [driver [_ _opts field]]
[:'log10 (sql.qp/->honeysql driver field)])
(defmethod sql.qp/->honeysql [:clickhouse :percentile]
- [driver [_ field p]]
+ [driver [_ _opts field p]]
[:raw "quantile(" (sql.qp/->honeysql driver p) ")(" (sql.qp/->honeysql driver field) ")"])
(defmethod sql.qp/->honeysql [:clickhouse :regex-match-first]
- [driver [_ arg pattern]]
+ [driver [_ _opts arg pattern]]
[:'extract (sql.qp/->honeysql driver arg) pattern])
(defmethod sql.qp/->honeysql [:clickhouse :split-part]
- [driver [_ text divider position]]
+ [driver [_ _opts text divider position]]
(let [position (sql.qp/->honeysql driver position)]
[:case
[:< position 1]
@@ -309,7 +309,7 @@
[:'toInt64 position]]]))
(defmethod sql.qp/->honeysql [:clickhouse :text]
- [driver [_ value]]
+ [driver [_ _opts value]]
(h2x/maybe-cast "TEXT" (sql.qp/->honeysql driver value)))
(defmethod sql.qp/date-dbtype :clickhouse
@@ -317,16 +317,16 @@
:Date32)
(defmethod sql.qp/->honeysql [:clickhouse :stddev]
- [driver [_ field]]
+ [driver [_ _opts field]]
[:'stddevPop (sql.qp/->honeysql driver field)])
(defmethod sql.qp/->honeysql [:clickhouse :median]
- [driver [_ field]]
+ [driver [_ _opts field]]
[:'median (sql.qp/->honeysql driver field)])
;; Substring does not work for Enums, so we need to cast to String
(defmethod sql.qp/->honeysql [:clickhouse :substring]
- [driver [_ arg start length]]
+ [driver [_ _opts arg start length]]
(let [str [:'toString (sql.qp/->honeysql driver arg)]]
(if length
[:'substring str
@@ -336,7 +336,7 @@
(sql.qp/->honeysql driver start)])))
(defmethod sql.qp/->honeysql [:clickhouse :var]
- [driver [_ field]]
+ [driver [_ _opts field]]
[:'varPop (sql.qp/->honeysql driver field)])
(defmethod sql.qp/float-dbtype :clickhouse
@@ -354,27 +354,28 @@
(defmethod sql.qp/->honeysql [:clickhouse :value]
[driver value]
- (let [[_ value {base-type :base_type}] value]
+ (let [[_ {:keys [base-type]} value] value]
(when (some? value)
(condp #(isa? %2 %1) base-type
:type/IPAddress [:'toIPv4 value]
(sql.qp/->honeysql driver value)))))
(defn- text-val? [value]
- (let [[qual valuevalue fieldinfo] value]
+ (let [[qual opts valuevalue] value]
(and (isa? qual :value)
- (isa? (:base_type fieldinfo) :type/Text)
+ (isa? (:base-type opts) :type/Text)
(nil? valuevalue))))
(defn- uuid-comp? [field value]
- (let [[qual valuevalue fieldinfo] value]
+ (let [[qual val-opts valuevalue] value
+ [_ field-opts] field]
(and (isa? qual :value)
- (isa? (:base_type fieldinfo) :type/UUID)
- (isa? (:base-type (nth field 2)) :type/UUID)
+ (isa? (:base-type val-opts) :type/UUID)
+ (isa? (:base-type field-opts) :type/UUID)
(string? valuevalue))))
(defmethod sql.qp/->honeysql [:clickhouse :=]
- [driver [op field value]]
+ [driver [_ _opts field value :as clause]]
(let [hsql-field (sql.qp/->honeysql driver field)
hsql-value (sql.qp/->honeysql driver value)]
(cond
@@ -391,10 +392,10 @@
[:= hsql-field hsql-value]
false)
- :else ((get-method sql.qp/->honeysql [:sql :=]) driver [op field value]))))
+ :else ((get-method sql.qp/->honeysql [:sql-mbql5 :=]) driver clause))))
(defmethod sql.qp/->honeysql [:clickhouse :!=]
- [driver [op field value]]
+ [driver [_ _opts field value :as clause]]
(let [hsql-field (sql.qp/->honeysql driver field)
hsql-value (sql.qp/->honeysql driver value)]
(cond
@@ -409,7 +410,7 @@
[:isNull hsql-field]]
true)
- :else ((get-method sql.qp/->honeysql [:sql :!=]) driver [op field value]))))
+ :else ((get-method sql.qp/->honeysql [:sql-mbql5 :!=]) driver clause))))
;; I do not know why the tests expect nil counts for empty results
;; but that's how it is :-)
@@ -419,14 +420,14 @@
;; metabase.query-processor.count-where-test
;; metabase.query-processor.share-test
(defmethod sql.qp/->honeysql [:clickhouse :count-where]
- [driver [_ pred]]
+ [driver [_ _opts pred]]
[:case
[:> [:'count] 0]
[:sum [:case (sql.qp/->honeysql driver pred) 1 :else 0]]
:else nil])
(defmethod sql.qp/->honeysql [:clickhouse :sum-where]
- [driver [_ field pred]]
+ [driver [_ _opts field pred]]
[:sum [:case (sql.qp/->honeysql driver pred) (sql.qp/->honeysql driver field)
:else 0]])
@@ -437,42 +438,42 @@
type-info (h2x/with-type-info type-info))))
(defn- clickhouse-string-fn
- [fn-name field value options]
- (let [[_ _ {:keys [base-type]}] field
+ [fn-name field value opts]
+ (let [[_ {:keys [base-type]} _] field
hsql-field (cond->> (sql.qp/->honeysql :clickhouse field)
(= base-type :type/UUID) (conj [:'toString]))
hsql-value (sql.qp/->honeysql :clickhouse value)]
- (if (get options :case-sensitive true)
+ (if (get opts :case-sensitive true)
[fn-name hsql-field hsql-value]
[fn-name [:'lowerUTF8 hsql-field] [:'lowerUTF8 hsql-value]])))
(defmethod sql.qp/->honeysql [:clickhouse :starts-with]
- [_ [_ field value options]]
+ [_ [_ opts field value]]
(let [starts-with (clickhouse-version/with-min 23 8
(constantly :'startsWithUTF8)
(constantly :'startsWith))]
- (clickhouse-string-fn starts-with field value options)))
+ (clickhouse-string-fn starts-with field value opts)))
(defmethod sql.qp/->honeysql [:clickhouse :ends-with]
- [_ [_ field value options]]
+ [_ [_ opts field value]]
(let [ends-with (clickhouse-version/with-min 23 8
(constantly :'endsWithUTF8)
(constantly :'endsWith))]
- (clickhouse-string-fn ends-with field value options)))
+ (clickhouse-string-fn ends-with field value opts)))
(defmethod sql.qp/->honeysql [:clickhouse :contains]
- [_ [_ field value options]]
- (let [[_ _ {:keys [base-type]}] field
+ [_ [_ opts field value]]
+ (let [[_ {:keys [base-type]} _] field
hsql-field (cond->> (sql.qp/->honeysql :clickhouse field)
(= base-type :type/UUID) (conj [:'toString]))
hsql-value (sql.qp/->honeysql :clickhouse value)
- position-fn (if (get options :case-sensitive true)
+ position-fn (if (get opts :case-sensitive true)
:'positionUTF8
:'positionCaseInsensitiveUTF8)]
[:> [position-fn hsql-field hsql-value] 0]))
(defmethod sql.qp/->honeysql [:clickhouse :datetime-diff]
- [driver [_ x y unit]]
+ [driver [_ _opts x y unit]]
(let [x (sql.qp/->honeysql driver x)
y (sql.qp/->honeysql driver y)]
(case unit
diff --git a/modules/drivers/databricks/src/metabase/driver/databricks.clj b/modules/drivers/databricks/src/metabase/driver/databricks.clj
index 9f350b620dc..7c24de93fd7 100644
--- a/modules/drivers/databricks/src/metabase/driver/databricks.clj
+++ b/modules/drivers/databricks/src/metabase/driver/databricks.clj
@@ -500,8 +500,8 @@
(sql.qp/->integer-with-round driver value))
(defmethod sql.qp/->honeysql [:databricks ::sql.qp/cast-to-text]
- [driver [_ expr]]
- (sql.qp/->honeysql driver [::sql.qp/cast expr "string"]))
+ [driver [_ _opts expr]]
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver ::sql.qp/cast expr "string")))
(defmethod sql-jdbc/impl-table-known-to-not-exist? :databricks
[_ e]
diff --git a/modules/drivers/druid-jdbc/src/metabase/driver/druid_jdbc.clj b/modules/drivers/druid-jdbc/src/metabase/driver/druid_jdbc.clj
index e4e696a698a..14c498c5c88 100644
--- a/modules/drivers/druid-jdbc/src/metabase/driver/druid_jdbc.clj
+++ b/modules/drivers/druid-jdbc/src/metabase/driver/druid_jdbc.clj
@@ -24,7 +24,7 @@
(set! *warn-on-reflection* true)
-(driver/register! :druid-jdbc :parent :sql-jdbc)
+(driver/register! :druid-jdbc :parent #{:sql-mbql5 :sql-jdbc})
(doseq [[feature supported?] {:set-timezone true
:expression-aggregations true
@@ -162,10 +162,10 @@
[:length [:to_json_string json-field-identifier]])
(defmethod sql.qp/->honeysql [:druid-jdbc :field]
- [driver [_ id-or-name opts :as clause]]
+ [driver [_ opts id-or-name :as clause]]
(let [stored-field (when (integer? id-or-name)
(driver-api/field (driver-api/metadata-provider) id-or-name))
- parent-method (get-method sql.qp/->honeysql [:sql :field])
+ parent-method (get-method sql.qp/->honeysql [:sql-mbql5 :field])
identifier (parent-method driver clause)]
(if-not (driver-api/json-field? stored-field)
identifier
diff --git a/modules/drivers/hive-like/src/metabase/driver/hive_like.clj b/modules/drivers/hive-like/src/metabase/driver/hive_like.clj
index c18c395b78a..ba5f78593e7 100644
--- a/modules/drivers/hive-like/src/metabase/driver/hive_like.clj
+++ b/modules/drivers/hive-like/src/metabase/driver/hive_like.clj
@@ -21,7 +21,7 @@
(set! *warn-on-reflection* true)
(driver/register! :hive-like
- :parent #{:sql-jdbc ::sql-jdbc.legacy/use-legacy-classes-for-read-and-set}
+ :parent #{:sql-mbql5 :sql-jdbc ::sql-jdbc.legacy/use-legacy-classes-for-read-and-set}
:abstract? true)
(doseq [[feature supported?] {:now true
@@ -172,22 +172,22 @@
3)])
(defmethod sql.qp/->honeysql [:hive-like :replace]
- [driver [_ arg pattern replacement]]
+ [driver [_ _opts arg pattern replacement]]
[:regexp_replace
(sql.qp/->honeysql driver arg)
(sql.qp/->honeysql driver pattern)
(sql.qp/->honeysql driver replacement)])
(defmethod sql.qp/->honeysql [:hive-like :regex-match-first]
- [driver [_ arg pattern]]
+ [driver [_ _opts arg pattern]]
[:regexp_extract (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver pattern) 0])
(defmethod sql.qp/->honeysql [:hive-like :median]
- [driver [_ arg]]
+ [driver [_ _opts arg]]
[:percentile (sql.qp/->honeysql driver arg) 0.5])
(defmethod sql.qp/->honeysql [:hive-like :percentile]
- [driver [_ arg p]]
+ [driver [_ _opts arg p]]
[:percentile (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver p)])
(defmethod sql.qp/add-interval-honeysql-form :hive-like
diff --git a/modules/drivers/presto-jdbc/src/metabase/driver/presto_jdbc.clj b/modules/drivers/presto-jdbc/src/metabase/driver/presto_jdbc.clj
index 579dd018490..bfd9fd5d6c4 100644
--- a/modules/drivers/presto-jdbc/src/metabase/driver/presto_jdbc.clj
+++ b/modules/drivers/presto-jdbc/src/metabase/driver/presto_jdbc.clj
@@ -47,7 +47,7 @@
(set! *warn-on-reflection* true)
-(driver/register! :presto-jdbc, :parent #{:sql-jdbc
+(driver/register! :presto-jdbc, :parent #{:sql-mbql5 :sql-jdbc
::sql-jdbc.legacy/use-legacy-classes-for-read-and-set})
(doseq [[feature supported?] {:basic-aggregations true
@@ -152,8 +152,8 @@
[:from_utf8 expr]))
(defmethod sql.qp/->honeysql [:presto-jdbc ::sql.qp/cast-to-text]
- [driver [_ expr]]
- (sql.qp/->honeysql driver [::sql.qp/cast expr "varchar"]))
+ [driver [_ _opts expr]]
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver ::sql.qp/cast expr "varchar")))
(defmethod sql.qp/->honeysql [:presto-jdbc Boolean]
[_ bool]
@@ -163,20 +163,16 @@
[_driver bs]
[:from_base64 (u/encode-base64-bytes bs)])
-(defmethod sql.qp/->honeysql [:presto-jdbc :time]
- [_ [_ t]]
- (h2x/cast :time (u.date/format-sql (t/local-time t))))
-
(defmethod sql.qp/->honeysql [:presto-jdbc :regex-match-first]
- [driver [_ arg pattern]]
+ [driver [_ _opts arg pattern]]
[:regexp_extract (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver pattern)])
(defmethod sql.qp/->honeysql [:presto-jdbc :median]
- [driver [_ arg]]
+ [driver [_ _opts arg]]
[:approx_percentile (sql.qp/->honeysql driver arg) 0.5])
(defmethod sql.qp/->honeysql [:presto-jdbc :percentile]
- [driver [_ arg p]]
+ [driver [_ _opts arg p]]
[:approx_percentile (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver p)])
;;; Presto mod is a function like mod(x, y) rather than an operator like x mod y
@@ -309,18 +305,17 @@
(def ^:private ^:const timestamp-with-time-zone-db-type "timestamp with time zone")
(defmethod sql.qp/->honeysql [:presto-jdbc :log]
- [driver [_ field]]
- ;; recent Presto versions have a `log10` function (not `log`)
+ [driver [_ _opts field]]
[:log10 (sql.qp/->honeysql driver field)])
(defmethod sql.qp/->honeysql [:presto-jdbc :count-where]
- [driver [_ pred]]
+ [driver [_ _opts pred]]
;; Presto will use the precision given here in the final expression, which chops off digits
;; need to explicitly provide two digits after the decimal
- (sql.qp/->honeysql driver [:sum-where 1.00M pred]))
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver :sum-where 1.00M pred)))
(defmethod sql.qp/->honeysql [:presto-jdbc :time]
- [_driver [_ t]]
+ [_driver [_ _opts t]]
;; make time in UTC to avoid any interpretation by Presto in the connection (i.e. report) time zone
[:inline (t/offset-time (t/local-time t) 0)])
diff --git a/modules/drivers/sparksql/src/metabase/driver/sparksql.clj b/modules/drivers/sparksql/src/metabase/driver/sparksql.clj
index a3397108494..00d33fc6426 100644
--- a/modules/drivers/sparksql/src/metabase/driver/sparksql.clj
+++ b/modules/drivers/sparksql/src/metabase/driver/sparksql.clj
@@ -18,6 +18,7 @@
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.sql.query-processor.like-escape-char-built-in :as-alias sql.qp.like-built-in]
[metabase.driver.sql.util :as sql.u]
+ [metabase.lib.core :as lib]
[metabase.util.honey-sql-2 :as h2x]
[metabase.util.performance :refer [select-keys every? empty? not-empty get-in]])
(:import
@@ -34,11 +35,11 @@
"t1")
(defmethod sql.qp/->honeysql [:sparksql :field]
- [driver [_ _ {::sql.params.substitution/keys [compiling-field-filter?]} :as field-clause]]
+ [driver [_ {::sql.params.substitution/keys [compiling-field-filter?]} _ :as field-clause]]
;; use [[source-table-alias]] instead of the usual `schema.table` to qualify fields e.g. `t1.field` instead of the
;; normal `schema.table.field`
(let [parent-method (get-method sql.qp/->honeysql [:hive-like :field])
- field-clause (driver-api/update-field-options
+ field-clause (lib/update-options
field-clause
(fn [{source-table driver-api/qp.add.source-table, :as options}]
(-> options
@@ -259,8 +260,8 @@
(sql.qp/->integer-with-round driver value))
(defmethod sql.qp/->honeysql [:sparksql ::sql.qp/cast-to-text]
- [driver [_ expr]]
- (sql.qp/->honeysql driver [::sql.qp/cast expr "string"]))
+ [driver [_ _opts expr]]
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver ::sql.qp/cast expr "string")))
(defmethod sql-jdbc/impl-table-known-to-not-exist? :sparksql
[_ e]
diff --git a/modules/drivers/starburst/src/metabase/driver/starburst.clj b/modules/drivers/starburst/src/metabase/driver/starburst.clj
index e4190e9895b..2b4a31f1bbb 100644
--- a/modules/drivers/starburst/src/metabase/driver/starburst.clj
+++ b/modules/drivers/starburst/src/metabase/driver/starburst.clj
@@ -49,7 +49,7 @@
(java.time.format DateTimeFormatter)
(java.time.temporal ChronoField Temporal)))
-(driver/register! :starburst, :parent #{::sql-jdbc.legacy/use-legacy-classes-for-read-and-set})
+(driver/register! :starburst, :parent #{:sql-mbql5 :sql-jdbc ::sql-jdbc.legacy/use-legacy-classes-for-read-and-set})
(set! *warn-on-reflection* true)
@@ -293,30 +293,30 @@
[:raw (if bool "TRUE" "FALSE")])
(defmethod sql.qp/->honeysql [:starburst :regex-match-first]
- [driver [_ arg pattern]]
+ [driver [_ _opts arg pattern]]
[:regexp_extract (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver pattern)])
(defmethod sql.qp/->honeysql [:starburst :median]
- [driver [_ arg]]
+ [driver [_ _opts arg]]
[:approx_percentile (sql.qp/->honeysql driver arg) 0.5])
(defmethod sql.qp/->honeysql [:starburst :percentile]
- [driver [_ arg p]]
+ [driver [_ _opts arg p]]
[:approx_percentile (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver p)])
(defmethod sql.qp/->honeysql [:starburst :log]
- [driver [_ field]]
+ [driver [_ _opts field]]
;; recent starburst versions have a `log10` function (not `log`)
[:log10 (sql.qp/->honeysql driver field)])
(defmethod sql.qp/->honeysql [:starburst :count-where]
- [driver [_ pred]]
+ [driver [_ _opts pred]]
;; starburst will use the precision given here in the final expression, which chops off digits
;; need to explicitly provide two digits after the decimal
- (sql.qp/->honeysql driver [:sum-where 1.00M pred]))
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver :sum-where 1.00M pred)))
(defmethod sql.qp/->honeysql [:starburst :time]
- [_ [_ t]]
+ [_ [_ _opts t]]
;; Convert t to locale time, then format as sql. Then add cast.
(h2x/cast :time (u.date/format-sql (t/local-time t))))
@@ -362,7 +362,7 @@
(->at-time-zone y)]))
(defmethod sql.qp/->honeysql [:starburst :convert-timezone]
- [driver [_ arg target-timezone source-timezone]]
+ [driver [_ _opts arg target-timezone source-timezone]]
(let [expr (sql.qp/->honeysql driver (cond-> arg
(string? arg) u.date/parse))
with_timezone? (or (sql.qp.u/field-with-tz? arg)
@@ -1033,8 +1033,8 @@
(.setSessionUser ^TrinoConnection (.unwrap conn TrinoConnection) role))
(defmethod sql.qp/->honeysql [:starburst ::sql.qp/cast-to-text]
- [driver [_ expr]]
- (sql.qp/->honeysql driver [::sql.qp/cast expr "varchar"]))
+ [driver [_ _opts expr]]
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver ::sql.qp/cast expr "varchar")))
;; starburst returns line numbers in error messages which will be off by 1 if
;; the remark is prepended (#64133)
diff --git a/modules/drivers/vertica/src/metabase/driver/vertica.clj b/modules/drivers/vertica/src/metabase/driver/vertica.clj
index 571d7e48c92..958759e6469 100644
--- a/modules/drivers/vertica/src/metabase/driver/vertica.clj
+++ b/modules/drivers/vertica/src/metabase/driver/vertica.clj
@@ -25,7 +25,7 @@
(set! *warn-on-reflection* true)
-(driver/register! :vertica, :parent #{:sql-jdbc
+(driver/register! :vertica, :parent #{:sql-mbql5 :sql-jdbc
::sql-jdbc.legacy/use-legacy-classes-for-read-and-set
::sql.qp.empty-string-is-null/empty-string-is-null})
@@ -140,7 +140,7 @@
(sql.qp/adjust-day-of-week :vertica [:dayofweek_iso expr]))
(defmethod sql.qp/->honeysql [:vertica :convert-timezone]
- [driver [_ arg target-timezone source-timezone]]
+ [driver [_ _opts arg target-timezone source-timezone]]
(let [expr (cast-timestamp (sql.qp/->honeysql driver arg))
timestamptz? (or (sql.qp.u/field-with-tz? arg)
(h2x/is-of-type? expr "timestamptz"))]
@@ -152,7 +152,7 @@
(h2x/with-database-type-info "timestamp"))))
(defmethod sql.qp/->honeysql [:vertica :concat]
- [driver [_ & args]]
+ [driver [_ _opts & args]]
(transduce
(map #(sql.qp/->honeysql driver %))
(completing (fn [x y]
@@ -214,7 +214,7 @@
"DOUBLE PRECISION")
(defmethod sql.qp/->honeysql [:vertica :regex-match-first]
- [driver [_ arg pattern]]
+ [driver [_ _opts arg pattern]]
[:regexp_substr (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver pattern)])
(defn- format-percentile
@@ -233,13 +233,11 @@
(sql/register-fn! ::percentile #'format-percentile)
(defmethod sql.qp/->honeysql [:vertica :percentile]
- [driver [_ arg p]]
- (let [arg (sql.qp/->honeysql driver arg)
- p (sql.qp/->honeysql driver p)]
- [::percentile arg p]))
+ [driver [_ _opts arg p]]
+ [::percentile (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver p)])
(defmethod sql.qp/->honeysql [:vertica :median]
- [driver [_ arg]]
+ [driver [_ _opts arg]]
[:approximate_median (sql.qp/->honeysql driver arg)])
(defmethod sql.qp/->honeysql [:vertica java.time.LocalDate]
@@ -272,7 +270,7 @@
(sql.qp/->honeysql driver (t/offset-date-time t)))
(defmethod sql.qp/->honeysql [:vertica ::sql.qp/expression-literal-text-value]
- [driver [_ value]]
+ [driver [_ _opts value]]
(->> (sql.qp/->honeysql driver value)
(h2x/cast "long varchar")))
@@ -343,8 +341,14 @@
t)))))
(defmethod sql.qp/->honeysql [:vertica ::sql.qp/cast-to-text]
- [driver [_ expr]]
- (sql.qp/->honeysql driver [::sql.qp/cast expr "varchar"]))
+ [driver [_ _opts expr]]
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver ::sql.qp/cast expr "varchar")))
+
+(defmethod sql.qp/->honeysql [:vertica :value]
+ [driver [_ {:keys [base-type effective-type]} value]]
+ ((get-method sql.qp/->honeysql [::sql.qp.empty-string-is-null/empty-string-is-null :value])
+ driver
+ [:value value {:base_type base-type :effective_type effective-type}]))
(defmethod sql-jdbc/impl-table-known-to-not-exist? :vertica
[_ e]
diff --git a/src/metabase/driver/h2.clj b/src/metabase/driver/h2.clj
index a8584c359fa..8611eaf6a0c 100644
--- a/src/metabase/driver/h2.clj
+++ b/src/metabase/driver/h2.clj
@@ -43,7 +43,7 @@
;; method impls live in this namespace
(comment h2.actions/keep-me)
-(driver/register! :h2, :parent #{:sql-jdbc ::like-escape-char-built-in/like-escape-char-built-in :sql-mbql5})
+(driver/register! :h2, :parent #{:sql-mbql5 :sql-jdbc ::like-escape-char-built-in/like-escape-char-built-in})
;;; this will prevent the H2 driver from showing up in the list of options when adding a new Database.
(defmethod driver/superseded-by :h2 [_driver] :deprecated)
diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
index d9fecdf472d..60f726814eb 100644
--- a/src/metabase/driver/mysql.clj
+++ b/src/metabase/driver/mysql.clj
@@ -51,7 +51,7 @@
mysql.actions/keep-me
mysql.ddl/keep-me)
-(driver/register! :mysql, :parent #{:sql-jdbc ::like-escape-char-built-in/like-escape-char-built-in})
+(driver/register! :mysql, :parent #{:sql-mbql5 :sql-jdbc ::like-escape-char-built-in/like-escape-char-built-in})
(def ^:private ^:const min-supported-mysql-version 5.7)
(def ^:private ^:const min-supported-mariadb-version 10.2)
@@ -417,7 +417,7 @@
:signed)
(defmethod sql.qp/->honeysql [:mysql :split-part]
- [driver [_ text divider position]]
+ [driver [_ _opts text divider position]]
(let [text (sql.qp/->honeysql driver text)
div (sql.qp/->honeysql driver divider)
pos (sql.qp/->honeysql driver position)]
@@ -443,21 +443,21 @@
div -1]]))
(defmethod sql.qp/->honeysql [:mysql :text]
- [driver [_ value]]
+ [driver [_ _opts value]]
(h2x/maybe-cast "CHAR" (sql.qp/->honeysql driver value)))
;; MySQL/MariaDB `CAST` does not accept `TEXT` as a target type — the string cast target is
;; `CHAR`.
(defmethod sql.qp/->honeysql [:mysql ::sql.qp/cast-to-text]
- [driver [_ expr]]
- (sql.qp/->honeysql driver [::sql.qp/cast expr "char"]))
+ [driver [_ _opts expr]]
+ (sql.qp/->honeysql driver (sql.qp/mbql-clause driver ::sql.qp/cast expr "char")))
(defmethod sql.qp/->honeysql [:mysql :regex-match-first]
- [driver [_ arg pattern]]
+ [driver [_ _opts arg pattern]]
[:regexp_substr (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver pattern)])
(defmethod sql.qp/->honeysql [:mysql :length]
- [driver [_ arg]]
+ [driver [_ _opts arg]]
[:char_length (sql.qp/->honeysql driver arg)])
(def ^:private database-type->mysql-cast-type-name
@@ -497,10 +497,10 @@
[:convert json-extract+jsonpath [:raw (u/upper-case-en field-type)]]))))
(defmethod sql.qp/->honeysql [:mysql :field]
- [driver [_ id-or-name opts :as mbql-clause]]
+ [driver [_ opts id-or-name :as mbql-clause]]
(let [stored-field (when (integer? id-or-name)
(driver-api/field (driver-api/metadata-provider) id-or-name))
- parent-method (get-method sql.qp/->honeysql [:sql :field])
+ parent-method (get-method sql.qp/->honeysql [:sql-mbql5 :field])
honeysql-expr (parent-method driver mbql-clause)]
(cond
(not (driver-api/json-field? stored-field))
@@ -607,7 +607,7 @@
(temporal-cast (h2x/database-type expr))))
(defmethod sql.qp/->honeysql [:mysql :convert-timezone]
- [driver [_ arg target-timezone source-timezone]]
+ [driver [_ _opts arg target-timezone source-timezone]]
(let [expr (sql.qp/->honeysql driver arg)
timestamp? (or (sql.qp.u/field-with-tz? arg)
(h2x/is-of-type? expr "timestamp"))]
diff --git a/src/metabase/driver/postgres.clj b/src/metabase/driver/postgres.clj
index e35ffe26902..0368dac0ca6 100644
--- a/src/metabase/driver/postgres.clj
+++ b/src/metabase/driver/postgres.clj
@@ -60,7 +60,7 @@
;; default `LIKE` escape character is already `\`, so an explicit `ESCAPE '\'` clause is
;; redundant *and* the literal `'\'` is unparseable by the PG JDBC driver when the server has
;; `standard_conforming_strings = off` (#73721).
-(driver/register! :postgres, :parent #{:sql-jdbc ::like-escape-char-built-in/like-escape-char-built-in :sql-mbql5})
+(driver/register! :postgres, :parent #{:sql-mbql5 :sql-jdbc ::like-escape-char-built-in/like-escape-char-built-in})
(defmethod driver/display-name :postgres [_] "PostgreSQL")
diff --git a/src/metabase/driver/sql/query_processor/empty_string_is_null.clj b/src/metabase/driver/sql/query_processor/empty_string_is_null.clj
index da358d3ee21..ac2b75e198a 100644
--- a/src/metabase/driver/sql/query_processor/empty_string_is_null.clj
+++ b/src/metabase/driver/sql/query_processor/empty_string_is_null.clj
@@ -12,9 +12,8 @@
(driver/register! ::empty-string-is-null, :abstract? true)
(defmethod sql.qp/->honeysql [::empty-string-is-null :value]
- [driver [_ value info]]
- (let [value (when-not (= value "")
- value)]
- ((get-method sql.qp/->honeysql [:sql :value]) driver [:value value info])))
+ [driver [_ value opts]]
+ (let [value (when-not (= value "") value)]
+ ((get-method sql.qp/->honeysql [:sql :value]) driver (sql.qp/mbql-clause-with-opts :sql :value opts value))))
(prefer-method sql.qp/->honeysql [::empty-string-is-null :value] [:sql :value])
diff --git a/src/metabase/driver/sqlite.clj b/src/metabase/driver/sqlite.clj
index 34c8e63e832..4433d82ac0f 100644
--- a/src/metabase/driver/sqlite.clj
+++ b/src/metabase/driver/sqlite.clj
@@ -31,7 +31,7 @@
(set! *warn-on-reflection* true)
-(driver/register! :sqlite, :parent :sql-jdbc)
+(driver/register! :sqlite, :parent #{:sql-mbql5 :sql-jdbc})
(defmethod driver/display-name :sqlite
[_driver]
@@ -402,28 +402,29 @@
(if bool 1 0))
(defmethod sql.qp/->honeysql [:sqlite :substring]
- [driver [_ arg start length]]
+ [driver [_ _opts arg start length]]
(if length
[:substr (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver start) (sql.qp/->honeysql driver length)]
[:substr (sql.qp/->honeysql driver arg) (sql.qp/->honeysql driver start)]))
(defmethod sql.qp/->honeysql [:sqlite :concat]
- [driver [_ & args]]
+ [driver [_ _opts & args]]
(into
[:||]
(mapv (partial sql.qp/->honeysql driver) args)))
(defmethod sql.qp/->honeysql [:sqlite :floor]
- [_driver [_ arg]]
- [:round (h2x/- arg 0.5)])
+ [driver [_ _opts arg]]
+ [:round (h2x/- (sql.qp/->honeysql driver arg) 0.5)])
(defmethod sql.qp/->honeysql [:sqlite :ceil]
- [_driver [_ arg]]
- [:case
- ;; if we're ceiling a whole number, just cast it to an integer
- ;; [:ceil 1.0] should returns 1
- [:= [:round arg] arg] (h2x/->integer arg)
- :else [:round (h2x/+ arg 0.5)]])
+ [driver [_ _opts arg]]
+ (let [arg (sql.qp/->honeysql driver arg)]
+ [:case
+ ;; if we're ceiling a whole number, just cast it to an integer
+ ;; [:ceil 1.0] should returns 1
+ [:= [:round arg] arg] (h2x/->integer arg)
+ :else [:round (h2x/+ arg 0.5)]]))
;; See https://sqlite.org/lang_datefunc.html
diff --git a/test/metabase/driver/mysql_test.clj b/test/metabase/driver/mysql_test.clj
index edc4bd56949..cd29d3b463f 100644
--- a/test/metabase/driver/mysql_test.clj
+++ b/test/metabase/driver/mysql_test.clj
@@ -652,12 +652,15 @@
(sync/sync-table! table)
(let [field (t2/select-one :model/Field :table_id (u/id table) :name "json_bit → 1234")]
(mt/with-metadata-provider (mt/id)
- (let [field-clause [:field (u/the-id field) {:binning
- {:strategy :num-bins,
- :num-bins 100,
- :min-value 0.75,
- :max-value 54.0,
- :bin-width 0.75}}]]
+ (let [field-clause (sql.qp/mbql-clause-with-opts driver/*driver*
+ :field
+ {:binning
+ {:strategy :num-bins,
+ :num-bins 100,
+ :min-value 0.75,
+ :max-value 54.0,
+ :bin-width 0.75}}
+ (u/the-id field))]
(is (= ["((FLOOR((((JSON_UNQUOTE(JSON_EXTRACT(`json`.`json_bit`, ?)) + 0.0) - 0.75) / 0.75)) * 0.75) + 0.75)"
"$.\"1234\""]
(sql.qp/format-honeysql :mysql (sql.qp/->honeysql :mysql field-clause)))))))))))))