Skip to content

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

Make card schema upgrade 23 a no-op (#66719)

Eric Normand37ec35a0c3eb
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 0bd57a5cde9..dbf34e827e7 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -1039,7 +1039,6 @@
eid-translation
embedding
events
- legacy-mbql
lib
lib-be
models
diff --git a/src/metabase/driver/sql_jdbc/connection.clj b/src/metabase/driver/sql_jdbc/connection.clj
index ca880aeb5da..bb29e601d51 100644
--- a/src/metabase/driver/sql_jdbc/connection.clj
+++ b/src/metabase/driver/sql_jdbc/connection.clj
@@ -1,7 +1,7 @@
(ns metabase.driver.sql-jdbc.connection
"Logic for creating and managing connection pools for SQL JDBC drivers. Implementations for connection-related driver
multimethods for SQL JDBC drivers."
- (:refer-clojure :exclude [some select-keys])
+ (:refer-clojure :exclude [some select-keys get-in])
(:require
[clojure.java.jdbc :as jdbc]
[metabase.driver :as driver]
@@ -13,7 +13,7 @@
[metabase.util.i18n :refer [tru]]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
- [metabase.util.performance :refer [some select-keys]]
+ [metabase.util.performance :refer [some select-keys get-in]]
[potemkin :as p]
^{:clj-kondo/ignore [:discouraged-namespace]}
[toucan2.core :as t2])
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index 40dfd40f7dd..5067881637e 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -17,8 +17,6 @@
[metabase.content-verification.core :as moderation]
[metabase.dashboards.autoplace :as autoplace]
[metabase.events.core :as events]
- ^{:clj-kondo/ignore [:discouraged-namespace]}
- [metabase.legacy-mbql.normalize :as leg-normalize]
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
[metabase.lib.metadata.protocols :as lib.metadata.protocols]
@@ -679,18 +677,9 @@
;; Discussion: https://metaboat.slack.com/archives/C05MPF0TM3L/p1764944945966649?thread_ts=1763990244.080579&cid=C05MPF0TM3L
(defmethod upgrade-card-schema-to 23
[card _schema-version]
- (cond
- (seq (:dataset_query card))
- card
-
- (not (seq (:legacy_query card)))
- card
-
- :else
- (assoc card :dataset_query (-> (:legacy_query card)
- mi/json-out-without-keywordization
- leg-normalize/normalize-or-throw
- lib/->pMBQL))))
+ ;; This fix was a failure. We have to keep the schema upgrade, but now it's
+ ;; just a no-op.
+ card)
(mu/defn- upgrade-card-schema-to-latest :- ::queries.schema/card
[card :- :map]