Skip to content

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

Dont add previous stage sql as source query for cached query sql (#78252)

Riley Thompsoncdac81f0cc92
diff --git a/src/metabase/driver/sql_mbql5.clj b/src/metabase/driver/sql_mbql5.clj
index 97ed002a3d2..1085677187f 100644
--- a/src/metabase/driver/sql_mbql5.clj
+++ b/src/metabase/driver/sql_mbql5.clj
@@ -28,6 +28,21 @@
driver-api/add-alias-info
:stages))
+(defn- add-source-query [driver prev-stage prev-hsql stage-hsql]
+ (let [table-alias (sql.qp/->honeysql driver (h2x/identifier :table-alias sql.qp/source-query-alias))
+ columns-metadata (get-in prev-stage [:lib/stage-metadata :columns])
+ desired-aliases (mapv :lib/desired-column-alias columns-metadata)
+ cur-hsql (cond-> (assoc stage-hsql :from [[prev-hsql [table-alias]]])
+ (sql.qp/needs-cte-for-duplicate-cols? columns-metadata)
+ (assoc :with [[[sql.qp/source-query-alias {:columns (mapv #(h2x/identifier :field %) desired-aliases)}]
+ prev-hsql]]
+ :from [[table-alias]])
+
+ ;; Clear the default select if it's just :* so add-default-select can recompute it
+ (= (:select stage-hsql) [[:*]])
+ (dissoc :select))]
+ (#'sql.qp/add-default-select driver cur-hsql)))
+
(defn- stage->honeysql [driver stage]
(cond
(:persisted-info/native stage)
@@ -44,22 +59,12 @@
(first
(reduce
(fn [[prev-hsql prev-stage] stage]
- (let [stage-hsql (stage->honeysql driver stage)]
- (if prev-hsql
- (let [table-alias (sql.qp/->honeysql driver (h2x/identifier :table-alias sql.qp/source-query-alias))
- columns-metadata (get-in prev-stage [:lib/stage-metadata :columns])
- desired-aliases (mapv :lib/desired-column-alias columns-metadata)
- cur-hsql (cond-> (assoc stage-hsql :from [[prev-hsql [table-alias]]])
- (sql.qp/needs-cte-for-duplicate-cols? columns-metadata)
- (assoc :with [[[sql.qp/source-query-alias {:columns (mapv #(h2x/identifier :field %) desired-aliases)}]
- prev-hsql]]
- :from [[table-alias]])
-
- ;; Clear the default select if it's just :* so add-default-select can recompute it
- (= (:select stage-hsql) [[:*]])
- (dissoc :select))]
- [(#'sql.qp/add-default-select driver cur-hsql) stage])
- [stage-hsql stage])))
+ [(cond->> (stage->honeysql driver stage)
+ ;; We don't add the source query if the stage is persisted, because the persisted query
+ ;; is already all of the previous stages materialized from the cached table
+ (and prev-hsql (not (:persisted-info/native stage)))
+ (add-source-query driver prev-stage prev-hsql))
+ stage])
[nil nil]
stages)))
diff --git a/test/metabase/query_processor/persistence_test.clj b/test/metabase/query_processor/persistence_test.clj
index e13523d267b..4179553c96c 100644
--- a/test/metabase/query_processor/persistence_test.clj
+++ b/test/metabase/query_processor/persistence_test.clj
@@ -8,6 +8,7 @@
[clojure.string :as str]
[clojure.test :refer :all]
[honey.sql :as sql]
+ [medley.core :as m]
[metabase.driver :as driver]
[metabase.driver.ddl.interface :as ddl.i]
[metabase.driver.sql.query-processor :as sql.qp]
@@ -266,3 +267,42 @@
(testing "Returns nil when card-id is not present"
(is (nil? (#'sql.qp/resolve-persisted-source-sql
{:source-table (mt/id :products)}))))))))))))
+
+(deftest persisted-models-multi-stage-test
+ (mt/test-drivers (mt/normal-drivers-with-feature :persist-models)
+ (mt/with-persistence-enabled! [persist-models!]
+ (let [mp (mt/metadata-provider)
+ orders (lib.metadata/table mp (mt/id :orders))
+ total (lib.metadata/field mp (mt/id :orders :total))
+ base-query (-> (lib/query mp orders)
+ (lib/expression "double_total" (lib/* total 2)))
+ double-total (m/find-first #(= (:name %) "double_total")
+ (lib/breakoutable-columns base-query))
+ custom-col-query (-> base-query
+ (lib/aggregate (lib/count))
+ (lib/breakout double-total))
+ product-id (lib.metadata/field mp (mt/id :orders :product_id))
+ base-query (-> (lib/query mp orders)
+ (lib/aggregate (lib/count))
+ (lib/breakout product-id)
+ lib/append-stage)
+ count-col (m/find-first #(= (:name %) "count")
+ (lib/filterable-columns base-query))
+ multi-stage-query (lib/filter base-query (lib/> count-col 5))]
+ (doseq [[description model-query] [["custom columns" custom-col-query]
+ ["multiple stages" multi-stage-query]]]
+ (testing (format "Persisted models with %s can be used as a source (#72480)" description)
+ (mt/with-temp [:model/Card model {:type :model
+ :database_id (mt/id)
+ :query_type :query
+ :dataset_query model-query}]
+ (persist-models!)
+ (let [card-mp (lib.metadata.jvm/application-database-metadata-provider (mt/id))
+ results (-> (lib/query card-mp (lib.metadata/card card-mp (:id model)))
+ (lib/limit 3)
+ (qp/process-query))
+ persisted-schema (ddl.i/schema-name (mt/db) (system/site-uuid))]
+ (testing "Was persisted"
+ (is (str/includes? (-> results :data :native_form :query) persisted-schema)))
+ (testing "Query returns rows"
+ (is (= 3 (count (mt/rows results)))))))))))))