Skip to content

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

Prevent looping past current-schema-version when already past it (#66785)

Eric Normand7fec8c9fbf3b
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index 5067881637e..a34b0cf4eed 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -695,7 +695,8 @@
{:card-id (:id card)}))
;; Plausible and has the schema, so run the upgrades over it.
(loop [card card]
- (if (= (:card_schema card) current-schema-version)
+ ;; Use >= to allow for downgrades.
+ (if (>= (:card_schema card) current-schema-version)
card
(let [new-version (inc (:card_schema card))]
(recur (assoc (upgrade-card-schema-to card new-version)
diff --git a/test/metabase/queries/models/card_test.clj b/test/metabase/queries/models/card_test.clj
index 49ec5b4e888..7db6c156127 100644
--- a/test/metabase/queries/models/card_test.clj
+++ b/test/metabase/queries/models/card_test.clj
@@ -700,6 +700,14 @@
:visualization_settings
json/decode+kw))))))
+(deftest ^:parallel upgrade-card-schema-after-downgrade
+ (testing "We exit the loop if a chard_schema is higher than the current schema."
+ (let [card {:id 1
+ :dataset_query {}
+ :card_schema (inc @#'card/current-schema-version)}]
+ (is (= card
+ (#'card/upgrade-card-schema-to-latest card))))))
+
(deftest storing-metabase-version
(testing "Newly created Card should know a Metabase version used to create it"
(mt/with-temp [:model/Card card {}]