Skip to content

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

GHY-4070: Update source cards before dependents when a database changes (#82378)

Andrei Simionescuc74356b123ab
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index 72be90e2062..731e13dd91e 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -1217,12 +1217,15 @@
(u/group-by :source_card_id :id conj #{} deps)))))
(defn- dependent-cards-to-update
+ "Return cards to rewrite when `root-card-id` moves off `old-db-id`, with sources before their dependents.
+ A card's `database_id` comes from its source card, so updating a dependent first preserves the old ID."
[root-card-id old-db-id]
- (let [all-dep-ids (graph/transitive (->SourceCardDependentsGraph) [root-card-id])]
- (when (seq all-dep-ids)
+ (when-let [all-dep-ids (seq (graph/transitive (->SourceCardDependentsGraph) [root-card-id]))]
+ (let [id->card (m/index-by :id (queries.db/card-queries all-dep-ids))]
(into []
- (filter (fn [{:keys [dataset_query]}] (= (:database dataset_query) old-db-id)))
- (queries.db/card-queries all-dep-ids)))))
+ (comp (map id->card)
+ (filter #(= (get-in % [:dataset_query :database]) old-db-id)))
+ all-dep-ids))))
(defn- cascade-database-change-to-dependents!
"When a card's `database_id` changes, update all cards that use it as a `:source-card` (transitively) so their
diff --git a/test/metabase/queries/models/card_test.clj b/test/metabase/queries/models/card_test.clj
index 77be084d3ff..9f65ceee28e 100644
--- a/test/metabase/queries/models/card_test.clj
+++ b/test/metabase/queries/models/card_test.clj
@@ -13,6 +13,7 @@
[metabase.lib.test-util.notebook-helpers :as notebook-helpers]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
+ [metabase.queries.db :as queries.db]
[metabase.queries.models.card :as card]
[metabase.queries.models.parameter-card :as parameter-card]
[metabase.queries.schema :as queries.schema]
@@ -1684,16 +1685,19 @@
:model/Card question3 (dependent-card db1-id question1)
:model/Card question4 (dependent-card db1-id question2)
:model/Card question5 (dependent-card db1-id question4)]
- (mt/with-test-user :crowberto
- (card/update-card! {:card-before-update model
- :card-updates {:dataset_query {:lib/type :mbql/query
- :database db2-id
- :stages [{:lib/type :mbql.stage/native
- :native "SELECT 1"}]}}}))
+ ;; H2 returns these rows source-first. Reverse them to cover a valid result order from PostgreSQL.
+ (mt/with-dynamic-fn-redefs [queries.db/card-queries
+ (comp reverse (mt/original-fn #'queries.db/card-queries))]
+ (mt/with-test-user :crowberto
+ (card/update-card! {:card-before-update model
+ :card-updates {:dataset_query {:lib/type :mbql/query
+ :database db2-id
+ :stages [{:lib/type :mbql.stage/native
+ :native "SELECT 1"}]}}})))
(doseq [question [question1 question2 question3 question4 question5]]
- (let [updated-card (t2/select-one :model/Card :id (:id question))]
- (is (= db2-id (get-in updated-card [:dataset_query :database])))
- (is (= db2-id (:database_id updated-card))))))))
+ (is (=? {:database_id db2-id
+ :dataset_query {:database db2-id}}
+ (t2/select-one :model/Card :id (:id question))))))))
(deftest find-stale-query-test
(testing "the Card `find-stale-query` method selects stale cards and applies the model's own exclusions"