Skip to content

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

implicit joins get implicit fields added (#68394)

William73766cf355c2
diff --git a/src/metabase/query_processor/preprocess.clj b/src/metabase/query_processor/preprocess.clj
index b4e8cceee8b..349188083d3 100644
--- a/src/metabase/query_processor/preprocess.clj
+++ b/src/metabase/query_processor/preprocess.clj
@@ -90,6 +90,8 @@
#'qp.add-default-temporal-unit/add-default-temporal-unit
#'qp.add-implicit-joins/add-implicit-joins
#'resolve-joins/resolve-joins
+ ;; rerun add-implicit-clauseds to add implicit fields clauses to implicit joins #67002
+ #'qp.add-implicit-clauses/add-implicit-clauses
#'fix-bad-field-id-refs/fix-bad-field-id-refs
#'qp.remove-inactive-field-refs/remove-inactive-field-refs
;; yes, this is called a second time, because we need to handle any joins that got added
diff --git a/src/metabase/query_processor/util/add_alias_info.clj b/src/metabase/query_processor/util/add_alias_info.clj
index 8aec783cf06..db8e6bf2c73 100644
--- a/src/metabase/query_processor/util/add_alias_info.clj
+++ b/src/metabase/query_processor/util/add_alias_info.clj
@@ -208,27 +208,11 @@
:source/native) ::none))
(defn- add-source-to-field-ref [query path field-ref col]
- (let [join-alias (:metabase.lib.join/join-alias col)
- ;; For implicit joins, use the original column name since that's what exists
- ;; in the actual database table (#67002).
- implicit-join? (when join-alias
- (when-let [join (m/find-first #(= (:alias %) join-alias)
- (:joins (get-in query path)))]
- (:qp/is-implicit-join join)))
- source-col-alias (if implicit-join?
- ((some-fn :lib/original-name :name) col)
- (:lib/source-column-alias col))]
- (lib/update-options
- field-ref #(-> %
- (assoc ::source-table (source-table query path col)
- ::source-alias (escaped-source-alias query path join-alias source-col-alias))
- ;; For implicit joins, ::source-table will be a string (join alias) rather than an
- ;; integer table ID. We need to explicitly enable coercion since the SQL QP checks
- ;; for (pos-int? ::source-table) to determine if coercion should be applied. This
- ;; follows the same pattern used by the SparkSQL driver. See #67704.
- (cond-> implicit-join?
- (assoc :qp/allow-coercion-for-columns-without-integer-qp.add.source-table true))
- (m/assoc-some ::nfc-path (not-empty (:nfc-path col)))))))
+ (lib/update-options
+ field-ref #(-> %
+ (assoc ::source-table (source-table query path col)
+ ::source-alias (escaped-source-alias query path (:metabase.lib.join/join-alias col) (:lib/source-column-alias col)))
+ (m/assoc-some ::nfc-path (not-empty (:nfc-path col))))))
(defn- fix-field-ref-if-it-should-actually-be-an-expression-ref
"I feel evil about doing this, since generally this namespace otherwise just ADDs info and does not in any other way
diff --git a/test/metabase/driver/sql/query_processor_test.clj b/test/metabase/driver/sql/query_processor_test.clj
index b1c15b16fed..e9d761c6fc3 100644
--- a/test/metabase/driver/sql/query_processor_test.clj
+++ b/test/metabase/driver/sql/query_processor_test.clj
@@ -982,7 +982,32 @@
:from [{:select [PRODUCTS__via__PRODUCT_ID.ID AS PRODUCTS__via__PRODUCT_ID__ID
COUNT (*) AS count]
:from [ORDERS]
- :left-join [PRODUCTS AS PRODUCTS__via__PRODUCT_ID
+ :left-join [{:select
+ [PRODUCTS.ID
+ AS
+ ID
+ PRODUCTS.EAN
+ AS
+ EAN
+ PRODUCTS.TITLE
+ AS
+ TITLE
+ PRODUCTS.CATEGORY
+ AS
+ CATEGORY
+ PRODUCTS.VENDOR
+ AS
+ VENDOR
+ PRODUCTS.PRICE
+ AS
+ PRICE
+ PRODUCTS.RATING
+ AS
+ RATING
+ PRODUCTS.CREATED_AT
+ AS
+ CREATED_AT],
+ :from [PRODUCTS]} AS PRODUCTS__via__PRODUCT_ID
ON ORDERS.PRODUCT_ID = PRODUCTS__via__PRODUCT_ID.ID]
:group-by [PRODUCTS__via__PRODUCT_ID.ID]
:order-by [PRODUCTS__via__PRODUCT_ID.ID ASC]}
diff --git a/test/metabase/query_processor/implicit_joins_test.clj b/test/metabase/query_processor/implicit_joins_test.clj
index cd26cdbca7a..d9a9477cdab 100644
--- a/test/metabase/query_processor/implicit_joins_test.clj
+++ b/test/metabase/query_processor/implicit_joins_test.clj
@@ -239,7 +239,7 @@
[[1 "a1"]
[2 "a2"]
[2 "a3"]]]
- ["long_col_name_2" [{:field-name "foo"
+ ["long_col_name_2" [{:field-name "foo_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abc"
:base-type :type/Integer}
{:field-name "abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_"
:base-type :type/Text}]
@@ -254,7 +254,7 @@
table (lib.metadata/table mp (mt/id :long_col_name))
query (lib/query mp table)
fk-field (mt/id :long_col_name :fk)
- id-2-field (mt/id :long_col_name_2 :foo)]
+ id-2-field (mt/id :long_col_name_2 :foo_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abcdefg_abc)]
(t2/update! :model/Field fk-field {:semantic_type :type/FK
:fk_target_field_id id-2-field})
(testing "Implicit join with long column name should use actual DB column name as source alias (#67002)"
@@ -272,7 +272,7 @@
(let [table-2 (lib.metadata/table mp (mt/id :long_col_name_2))
join-cols (lib/joinable-columns query -1 table-2)
fk-col (lib.metadata/field mp (mt/id :long_col_name :fk))
- id-col (m/find-first #(= (u/lower-case-en (:name %)) "foo") join-cols)
+ id-col (m/find-first #(str/starts-with? (u/lower-case-en (:name %)) "foo") join-cols)
join-clause (-> (lib/join-clause table-2)
(lib/with-join-conditions [(lib/= fk-col id-col)])
(lib/with-join-fields :all))
diff --git a/test/metabase/query_processor/preprocess_test.clj b/test/metabase/query_processor/preprocess_test.clj
index 4635a5002f0..1b206f0ff10 100644
--- a/test/metabase/query_processor/preprocess_test.clj
+++ b/test/metabase/query_processor/preprocess_test.clj
@@ -441,7 +441,7 @@
[:field "ID" {:base-type :type/BigInteger}]
[:field (meta/id :checkins :id)
{:base-type :type/BigInteger, :join-alias "CH"}]]}
- {:source-table (meta/id :venues)
+ {:source-query {:source-table (meta/id :venues)}
:qp/is-implicit-join true
:fk-join-alias "CH"
:alias "VENUES__via__VENUE_ID__via__CH"
diff --git a/test/metabase/query_processor/util/add_alias_info_test.clj b/test/metabase/query_processor/util/add_alias_info_test.clj
index 6c9e7120af2..b33ad773612 100644
--- a/test/metabase/query_processor/util/add_alias_info_test.clj
+++ b/test/metabase/query_processor/util/add_alias_info_test.clj
@@ -1163,6 +1163,12 @@
:join-alias "PRODUCTS__via__PRODUCT_ID"
::add/desired-alias "PRODUCTS__via__PRODUC_8b0b9fea"
::add/source-table "PRODUCTS__via__PRODUCT_ID"}
+ any?]]
+ [:asc {}
+ [:field
+ {::add/source-alias "PRODUCT_ID",
+ ::add/desired-alias "PRODUCT_ID",
+ ::add/source-table (meta/id :orders)}
any?]]]
:aggregation [[:sum {::add/source-table ::add/none
::add/source-alias "sum"