Skip to content

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

fix transform inspector regression on unaliased join tables (#73084)

Nicola Mometto0b1adbfdcca3
diff --git a/enterprise/backend/src/metabase_enterprise/transforms_inspector/query_analysis.clj b/enterprise/backend/src/metabase_enterprise/transforms_inspector/query_analysis.clj
index ffb46506044..c1cc0b9493d 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms_inspector/query_analysis.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms_inspector/query_analysis.clj
@@ -94,16 +94,15 @@
;;; isolating macaw details to this namespace.
(defn- macaw-table->hsql
- "Convert a macaw table node to a HoneySQL table reference.
- Returns `[table-identifier :alias]` when aliased, or `table-identifier` when not.
- The alias is a plain keyword since HoneySQL expects that in FROM/JOIN position."
+ "Convert a macaw table node to a HoneySQL table reference suitable for a FROM or JOIN entry.
+ Returns `[table-identifier :alias]` when aliased, or `[table-identifier]` when not."
[driver {:keys [schema table table-alias]}]
(let [table-id (apply h2x/identifier :table
(remove nil? [(some->> schema (sql.normalize/normalize-name driver))
(sql.normalize/normalize-name driver table)]))]
(if table-alias
[table-id (keyword (sql.normalize/normalize-name driver table-alias))]
- table-id)))
+ [table-id])))
(defn- macaw-column->hsql
"Convert a macaw column node to a HoneySQL column identifier."
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_inspector/query_analysis_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_inspector/query_analysis_test.clj
index 9efb51374a2..92f9f164549 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_inspector/query_analysis_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_inspector/query_analysis_test.clj
@@ -1,8 +1,10 @@
(ns ^:mb/driver-tests metabase-enterprise.transforms-inspector.query-analysis-test
(:require
[clojure.test :refer :all]
+ [metabase-enterprise.transforms-inspector.lens.join-analysis :as join-analysis]
[metabase-enterprise.transforms-inspector.query-analysis :as query-analysis]
[metabase.driver :as driver]
+ [metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.sql.util :as sql.u]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
@@ -107,3 +109,38 @@
"simple table join should resolve to a real table ID")
(is (nil? (:source-table cte-join))
"CTE join should not resolve to a real table ID"))))))
+
+(deftest ^:parallel macaw-table->hsql-returns-vector-test
+ (testing "unaliased table wraps the identifier in a single-element vector"
+ (let [result (#'query-analysis/macaw-table->hsql :h2 {:schema "public" :table "orders"})]
+ (is (= [[:metabase.util.honey-sql-2/identifier :table ["PUBLIC" "ORDERS"]]] result))))
+ (testing "aliased table returns [identifier alias]"
+ (let [result (#'query-analysis/macaw-table->hsql :h2 {:schema "public" :table "orders" :table-alias "o"})]
+ (is (= [[:metabase.util.honey-sql-2/identifier :table ["PUBLIC" "ORDERS"]] :O] result)))))
+
+(deftest ^:parallel macaw-table->hsql-compiles-in-from-test
+ (testing "unaliased table compiles in a :from position without illegal-syntax errors"
+ (let [from-table (#'query-analysis/macaw-table->hsql :h2 {:schema "public" :table "orders"})
+ [sql] (sql.qp/format-honeysql :h2 {:select [[[:count :*]]]
+ :from [from-table]})]
+ (is (string? sql))
+ (is (re-find #"(?i)from" sql))
+ (is (re-find #"(?i)orders" sql))))
+ (testing "aliased table compiles in a :from position"
+ (let [from-table (#'query-analysis/macaw-table->hsql :h2 {:schema "public" :table "orders" :table-alias "o"})
+ [sql] (sql.qp/format-honeysql :h2 {:select [[[:count :*]]]
+ :from [from-table]})]
+ (is (string? sql))
+ (is (re-find #"(?i)orders" sql)))))
+
+(deftest ^:parallel build-native-join-step-hsql-compiles-with-unaliased-tables-test
+ (testing "build-native-join-step-hsql output compiles when FROM and JOIN tables come from macaw-table->hsql without aliases"
+ (let [from-table (#'query-analysis/macaw-table->hsql :h2 {:schema "public" :table "orders"})
+ join-table (#'query-analysis/macaw-table->hsql :h2 {:schema "public" :table "products"})
+ joins [{:strategy :left-join
+ :join-table join-table
+ :join-condition [:= [:raw "orders.product_id"] [:raw "products.id"]]}]
+ hsql (#'join-analysis/build-native-join-step-hsql from-table joins)
+ [sql] (sql.qp/format-honeysql :h2 hsql)]
+ (is (string? sql))
+ (is (re-find #"(?i)left join" sql)))))