Skip to content

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

Make native validation allow using current-level aliases in other clauses (#64701)

William57afac78ba9b
diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/native_validation_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/native_validation_test.clj
index 296805823b5..ebf53f41b05 100644
--- a/enterprise/backend/test/metabase_enterprise/dependencies/native_validation_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/dependencies/native_validation_test.clj
@@ -98,19 +98,40 @@
(validates? mp driver 11 [{:column "CATEGORY",
:alias nil,
:type :single-column,
- :source-columns [[]],
+ :source-columns [[{:column "ID",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PEOPLE"}}]]}
+ {:column "NAME",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PEOPLE"}}]]}]],
:metabase.driver.sql/bad-reference true}])
(validates? mp driver 12 [{:column "CATEGORY",
:alias nil,
:type :single-column,
- :source-columns [[]],
+ :source-columns [[{:column "ID",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PEOPLE"}}]]}
+ {:column "NAME",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PEOPLE"}}]]}]],
:metabase.driver.sql/bad-reference true}]))
(testing "Nested subqueries"
(validates? mp driver 13 empty?)
(validates? mp driver 14 [{:column "CATEGORY",
:alias nil,
:type :single-column,
- :source-columns [[]],
+ :source-columns [[{:column "ID",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PEOPLE"}}]]}
+ {:column "NAME",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PEOPLE"}}]]}]],
:metabase.driver.sql/bad-reference true}]))
(testing "SELECT * from subquery expands to subquery columns"
(validates? mp driver 15 empty?)
@@ -118,7 +139,14 @@
(validates? mp driver 17 [{:column "EMAIL",
:alias nil,
:type :single-column,
- :source-columns [[]],
+ :source-columns [[{:column "ID",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PEOPLE"}}]]}
+ {:column "NAME",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PEOPLE"}}]]}]],
:metabase.driver.sql/bad-reference true}])))))
(deftest ^:parallel validate-card-reference-after-expansion-test
@@ -132,7 +160,39 @@
[{:column "DESCRIPTION",
:alias nil,
:type :single-column,
- :source-columns [[]],
+ :source-columns
+ [[{:column "ID",
+ :alias "ID",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "EAN",
+ :alias "EAN",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "TITLE",
+ :alias "TITLE",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "CATEGORY",
+ :alias "CATEGORY",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "VENDOR",
+ :alias "VENDOR",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "PRICE",
+ :alias "PRICE",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "RATING",
+ :alias "RATING",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "CREATED_AT",
+ :alias "CREATED_AT",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}]],
:metabase.driver.sql/bad-reference true}]))
(testing "Card reference with alias - valid column"
(validates? mp driver 20 empty?))
@@ -141,7 +201,38 @@
[{:column "PASSWORD",
:alias nil,
:type :single-column,
- :source-columns [[]],
+ :source-columns [[{:column "ID",
+ :alias "ID",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "EAN",
+ :alias "EAN",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "TITLE",
+ :alias "TITLE",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "CATEGORY",
+ :alias "CATEGORY",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "VENDOR",
+ :alias "VENDOR",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "PRICE",
+ :alias "PRICE",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "RATING",
+ :alias "RATING",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "CREATED_AT",
+ :alias "CREATED_AT",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}]]
:metabase.driver.sql/bad-reference true}]))
(testing "Wildcard selection from card reference"
(validates? mp driver 22 empty?))
@@ -150,7 +241,38 @@
[{:column "LATITUDE",
:alias nil,
:type :single-column,
- :source-columns [[]],
+ :source-columns [[{:column "ID",
+ :alias "ID",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "EAN",
+ :alias "EAN",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "TITLE",
+ :alias "TITLE",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "CATEGORY",
+ :alias "CATEGORY",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "VENDOR",
+ :alias "VENDOR",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "PRICE",
+ :alias "PRICE",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "RATING",
+ :alias "RATING",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}
+ {:column "CREATED_AT",
+ :alias "CREATED_AT",
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "PRODUCTS", :schema "PUBLIC"}}]]}]],
:metabase.driver.sql/bad-reference true}])))))
(defn- check-result-metadata [driver mp query expected]
diff --git a/src/metabase/driver/sql/references.clj b/src/metabase/driver/sql/references.clj
index 4c79ddc1820..e13dcc90018 100644
--- a/src/metabase/driver/sql/references.clj
+++ b/src/metabase/driver/sql/references.clj
@@ -93,14 +93,10 @@
[[(find-source expr sources)]]
sources)
source-columns (into []
- (map #(into []
- (comp (mapcat :returned-fields)
- (filter (fn [{field-alias :alias
- field-type :type
- field-column :column}]
- (or (= field-type :all-columns)
- (= (or field-alias field-column) column)))))
- %))
+ (comp (map #(into []
+ (mapcat :returned-fields)
+ %))
+ (filter seq))
valid-sources)
source-column (some #(when (= column (or (:alias %) (:column %)))
%)
@@ -244,10 +240,16 @@
(defmethod find-used-fields [:sql :macaw.ast/select]
[driver outside-sources withs expr]
(let [local-sources (get-select-sources driver outside-sources withs expr)
- sources (cons local-sources outside-sources)
- rec (partial find-used-fields driver sources withs)]
+ with-outside (cons local-sources outside-sources)
+ with-select (cons [{:used-fields #{}
+ :returned-fields (->> (find-returned-fields driver outside-sources withs expr)
+ (filter :alias))
+ :names nil}]
+ with-outside)
+ rec (partial find-used-fields driver with-select withs)]
(-> (into #{}
- (mapcat rec)
+ ;; a select can't refer to its own aliases, so don't include them in sources here
+ (mapcat (partial find-used-fields driver with-outside withs))
(:select expr))
(into (rec (:where expr)))
(into (mapcat rec)
diff --git a/test/metabase/driver/sql/references_test.clj b/test/metabase/driver/sql/references_test.clj
index 0423877ac83..111559da457 100644
--- a/test/metabase/driver/sql/references_test.clj
+++ b/test/metabase/driver/sql/references_test.clj
@@ -191,13 +191,19 @@
:alias nil,
:type :single-column,
:source-columns
- [[]]}},
+ [[{:column "b",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "products"}}]]}]]}},
:returned-fields
[{:column "a",
:alias nil,
:type :single-column,
:source-columns
- [[]]}]}
+ [[{:column "b",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "products"}}]]}]]}]}
(->references "select a from (select b from products)"))))
(deftest different-case-nested-query-test
@@ -261,12 +267,12 @@
#{{:column "a",
:alias nil,
:type :single-column,
- :source-columns [[]]}},
+ :source-columns []}},
:returned-fields
[{:column "a",
:alias nil,
:type :single-column,
- :source-columns [[]]}]}
+ :source-columns []}]}
(->references "select bad.a from products"))))
(deftest basic-where-test
@@ -316,7 +322,14 @@
#{{:column "category",
:alias nil,
:type :single-column,
- :source-columns [[{:type :all-columns,
+ :source-columns [[{:alias "sum",
+ :type :custom-field,
+ :used-fields
+ #{{:column "total",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "orders"}}]]}}}]
+ [{:type :all-columns,
:table {:table "orders"}}]]}
{:column "total",
:alias nil,
@@ -333,6 +346,45 @@
:source-columns [[{:type :all-columns, :table {:table "orders"}}]]}}}]}
(->references "select sum(total) as sum from orders group by category"))))
+(deftest grouping-order-by-test
+ (is (= {:used-fields
+ #{{:alias "cards_created",
+ :type :custom-field,
+ :used-fields
+ #{{:column "creator_id",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "report_card"}}]]}}}
+ {:column "creator_id",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "report_card"}}]]}
+ {:column "creator_id",
+ :alias nil,
+ :type :single-column,
+ :source-columns
+ [[{:alias "cards_created",
+ :type :custom-field,
+ :used-fields
+ #{{:column "creator_id",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "report_card"}}]]}}}]
+ [{:type :all-columns, :table {:table "report_card"}}]]}},
+ :returned-fields
+ [{:column "creator_id",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "report_card"}}]]}
+ {:alias "cards_created",
+ :type :custom-field,
+ :used-fields
+ #{{:column "creator_id",
+ :alias nil,
+ :type :single-column,
+ :source-columns [[{:type :all-columns, :table {:table "report_card"}}]]}}}]}
+ (->references "SELECT creator_id, COUNT(creator_id) AS cards_created FROM report_card GROUP BY creator_id ORDER BY cards_created DESC"))))
+
(deftest basic-arg-test
(is (= {:used-fields
#{{:column "category",
@@ -477,7 +529,6 @@
:type :single-column,
:source-columns [[{:type :all-columns,
:table {:table "products"}}]
- []
[{:type :all-columns,
:table {:table "orders"}}]]}},
:returned-fields
@@ -486,7 +537,6 @@
:type :single-column,
:source-columns [[{:type :all-columns,
:table {:table "products"}}]
- []
[{:type :all-columns,
:table {:table "orders"}}]]}
{:type :all-columns, :table {:table "orders"}}]}
@@ -536,16 +586,14 @@
:alias nil,
:type :single-column,
:source-columns
- [[]
- [{:type :all-columns, :table {:table "products"}}]
+ [[{:type :all-columns, :table {:table "products"}}]
[{:type :all-columns, :table {:table "orders"}}]]}},
:returned-fields
[{:column "category",
:alias nil,
:type :single-column,
:source-columns
- [[]
- [{:type :all-columns, :table {:table "products"}}]
+ [[{:type :all-columns, :table {:table "products"}}]
[{:type :all-columns, :table {:table "orders"}}]]}]}
(->references "select (select (select category) from products where products.id = orders.product_id) from orders"))))
@@ -838,7 +886,13 @@ FROM c;"))))
{:column "manager_id",
:alias nil,
:type :single-column,
- :source-columns [[{:type :all-columns, :table {:table "employees"}}]]}},
+ :source-columns [[{:type :all-columns, :table {:table "employees"}}]]}
+ {:column "manager_id",
+ :alias nil,
+ :type :single-column,
+ :source-columns
+ [[{:alias "level", :type :custom-field, :used-fields #{}}]
+ [{:type :all-columns, :table {:table "employees"}}]]}},
:returned-fields
[{:alias "name",
:type :composite-field,