Skip to content

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

Fix joined nested field reference compilation (#73240)

metambenc1d93652b1b3
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 42c6519e14b..0de642404cf 100644
--- a/modules/drivers/druid-jdbc/src/metabase/driver/druid_jdbc.clj
+++ b/modules/drivers/druid-jdbc/src/metabase/driver/druid_jdbc.clj
@@ -168,9 +168,20 @@
identifier (parent-method driver clause)]
(if-not (driver-api/json-field? stored-field)
identifier
- (if (or (::sql.qp/forced-alias opts)
- (= driver-api/qp.add.source (driver-api/qp.add.source-table opts)))
+ (cond
+ (or (::sql.qp/forced-alias opts)
+ (= driver-api/qp.add.source (driver-api/qp.add.source-table opts)))
(keyword (driver-api/qp.add.source-alias opts))
+
+ ;; The field is referenced through a join (source-table is a join-alias
+ ;; string). The join target is compiled as a subquery that already
+ ;; projects this nfc column with JSON extraction applied — reference the
+ ;; projected column directly instead of re-applying extraction, which
+ ;; would derive the wrong column name through nested projections. (#73198)
+ (string? (driver-api/qp.add.source-table opts))
+ identifier
+
+ :else
(perf/postwalk #(if (h2x/identifier? %)
(sql.qp/json-query :druid-jdbc % stored-field)
%)
diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
index 4990f86dd91..b5cacce2567 100644
--- a/src/metabase/driver/mysql.clj
+++ b/src/metabase/driver/mysql.clj
@@ -491,6 +491,14 @@
(::sql.qp/forced-alias opts)
(keyword (driver-api/qp.add.source-alias opts))
+ ;; The field is referenced through a join (source-table is a join-alias
+ ;; string). The join target is compiled as a subquery that already
+ ;; projects this nfc column with JSON extraction applied — reference the
+ ;; projected column directly instead of re-applying extraction, which
+ ;; would derive the wrong column name through nested projections. (#73198)
+ (string? (driver-api/qp.add.source-table opts))
+ honeysql-expr
+
:else
(perf/postwalk #(if (h2x/identifier? %)
(sql.qp/json-query :mysql % stored-field)
diff --git a/src/metabase/driver/postgres.clj b/src/metabase/driver/postgres.clj
index 46abcb35718..987e51a44a9 100644
--- a/src/metabase/driver/postgres.clj
+++ b/src/metabase/driver/postgres.clj
@@ -766,9 +766,21 @@
(pg-conversion identifier :numeric)
(driver-api/json-field? stored-field)
- (if (or (::sql.qp/forced-alias opts)
- (= (driver-api/qp.add.source-table opts) driver-api/qp.add.source))
+ (cond
+ (or (::sql.qp/forced-alias opts)
+ (= (driver-api/qp.add.source-table opts) driver-api/qp.add.source))
(keyword (driver-api/qp.add.source-alias opts))
+
+ ;; The field is referenced through a join (source-table is a join-alias
+ ;; string). The join target is compiled as a subquery that already
+ ;; projects this nfc column with JSON extraction applied — reference
+ ;; the projected column directly instead of re-applying extraction,
+ ;; which would derive the wrong column name through nested
+ ;; projections. (#73198)
+ (string? (driver-api/qp.add.source-table opts))
+ identifier
+
+ :else
(perf/postwalk #(if (h2x/identifier? %)
(sql.qp/json-query :postgres % stored-field)
%)
diff --git a/test/metabase/query_processor/explicit_joins_test.clj b/test/metabase/query_processor/explicit_joins_test.clj
index 6c8c0f1fc5a..096e470ddf9 100644
--- a/test/metabase/query_processor/explicit_joins_test.clj
+++ b/test/metabase/query_processor/explicit_joins_test.clj
@@ -4,6 +4,7 @@
[clojure.string :as str]
[clojure.test :refer :all]
[metabase.driver :as driver]
+ [metabase.driver.mysql :as mysql]
[metabase.driver.sql.query-processor-test-util :as sql.qp-test-util]
[metabase.driver.util :as driver.u]
[metabase.lib.convert :as lib.convert]
@@ -1624,6 +1625,78 @@
2 1 123 110.93 6.1 117.03 nil "2018-05-15T08:04:04.58Z" 3]]
(mt/rows (qp/process-query q2))))))))))
+(deftest ^:parallel join-model-with-model-joining-jsonb-table-test
+ (testing (str "Joining a plain model with a model that itself joins another table containing a JSON column "
+ "should compile correctly when the plain model is the LHS of the join (#73198)")
+ (mt/test-drivers (mt/normal-drivers-with-feature :nested-field-columns :left-join)
+ (mt/dataset (mt/dataset-definition "issue-73198"
+ [["test01"
+ [{:field-name "name", :base-type :type/Text}]
+ [["t01_A"]
+ ["t01_B"]]]
+ ["test02"
+ [{:field-name "name", :base-type :type/Text}
+ {:field-name "test01_id", :base-type :type/Integer, :fk :test01}]
+ [["t02_A1" 1]
+ ["t02_A2" 1]
+ ["t02_B1" 2]]]
+ ["test03"
+ [{:field-name "name", :base-type :type/Text}
+ {:field-name "test02_id", :base-type :type/Integer, :fk :test02}
+ {:field-name "data", :base-type :type/JSON,
+ :semantic-type :type/SerializedJSON}]
+ [["t03_1" 1 "{\"key1\":\"value1\",\"key2\":\"value2\"}"]
+ ["t03_2" 1 "{\"items\":[1,2,3]}"]
+ ["t03_3" 2 "{\"items\":[{\"a\":10},{\"a\":20}]}"]
+ ["t03_4" 3 "{\"flag\":true,\"count\":5}"]]]])
+ ;; The bug requires a JSON nfc child to be referenced through a join, so this test
+ ;; only makes sense on drivers that reify nested JSON fields as their own columns
+ ;; at sync time. MariaDB shares the :mysql driver but stores JSON as text and
+ ;; doesn't unfold it, so the `data → key1` field this test references won't exist.
+ (when-not (mysql/mariadb? (mt/db))
+ (let [mp (mt/metadata-provider)
+ ;; Model A: just test01.
+ q1 (lib/query mp (lib.metadata/table mp (mt/id :test01)))
+ ;; Model B: test02 joined with test03 on test02.id = test03.test02_id.
+ q2 (-> (lib/query mp (lib.metadata/table mp (mt/id :test02)))
+ (lib/join (-> (lib/join-clause (lib.metadata/table mp (mt/id :test03)))
+ (lib/with-join-conditions
+ [(lib/= (lib.metadata/field mp (mt/id :test02 :id))
+ (lib.metadata/field mp (mt/id :test03 :test02_id)))])
+ (lib/with-join-fields :all))))
+ mp (lib.tu/mock-metadata-provider
+ mp
+ {:cards [{:id 1
+ :type :model
+ :name "Test01"
+ :dataset-query q1}
+ {:id 2
+ :type :model
+ :name "Test02 + Test03"
+ :dataset-query q2}]})
+ ;; Question: Model A (Test01) joined with Model B (Test02 + Test03)
+ ;; The join projects an explicit list of fields including one JSON nfc child
+ ;; (`data → key1`), which is what triggers the buggy SQL compilation.
+ query (-> (lib/query mp (lib.metadata/card mp 1))
+ (lib/join (-> (lib/join-clause (lib.metadata/card mp 2))
+ (lib/with-join-conditions
+ [(lib/= (lib.metadata/field mp (mt/id :test01 :id))
+ (lib.metadata/field mp (mt/id :test02 :test01_id)))])
+ (lib/with-join-fields
+ [(lib.metadata/field mp (mt/id :test02 :id))
+ (lib.metadata/field mp (mt/id :test02 :name))
+ (lib.metadata/field mp (mt/id :test03 :id))
+ (lib.metadata/field mp (mt/id :test03 :name))
+ (lib.metadata/field mp (mt/id :test03 "data → key1"))])))
+ (lib/order-by (lib.metadata/field mp (mt/id :test01 :id)) :asc)
+ (lib/order-by (lib.metadata/field mp (mt/id :test03 :id)) :asc))]
+ (mt/with-native-query-testing-context query
+ (is (= [[1 "t01_A" 1 "t02_A1" 1 "t03_1" "value1"]
+ [1 "t01_A" 1 "t02_A1" 2 "t03_2" nil]
+ [1 "t01_A" 2 "t02_A2" 3 "t03_3" nil]
+ [2 "t01_B" 3 "t02_B1" 4 "t03_4" nil]]
+ (-> query qp/process-query mt/rows))))))))))
+
(deftest ^:parallel self-join-with-capitalized-table-test
(mt/test-drivers (mt/normal-driver-select {:+features [:left-join]})
(mt/dataset (mt/dataset-definition "self-join-db"