The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Split up `queries` and `queries-rest` modules (#66677)
Cam Saul4509828711c9
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.ednindex c458a179f3f..d7029878b78 100644--- a/.clj-kondo/config.edn+++ b/.clj-kondo/config.edn@@ -577,11 +577,11 @@metabase.pulse.models.pulse-test/with-dashboard-subscription-in-collection! hooks.common/with-four-bindingsmetabase.pulse.models.pulse-test/with-pulse-in-collection! hooks.common/with-four-bindingsmetabase.pulse.test-util/checkins-query-card hooks.metabase.test.data/$ids- metabase.queries.api.card-test/with-card-param-values-fixtures hooks.common/let-one-with-optional-value- metabase.queries.api.card-test/with-temp-native-card hooks.common/with-two-bindings- metabase.queries.api.card-test/with-temp-native-card-with-params hooks.common/with-two-bindings- metabase.query-processor.expressions-test/calculate-bird-scarcity hooks.metabase.query-processor.expressions-test/calculate-bird-scarcity- metabase.query-processor.filter-test/count-with-filter-clause hooks.metabase.test.data/$ids+ metabase.queries-rest.api.card-test/with-card-param-values-fixtures hooks.common/let-one-with-optional-value+ metabase.queries-rest.api.card-test/with-temp-native-card hooks.common/with-two-bindings+ metabase.queries-rest.api.card-test/with-temp-native-card-with-params hooks.common/with-two-bindings+ metabase.query-processor.expressions-test/calculate-bird-scarcity hooks.metabase.query-processor.expressions-test/calculate-bird-scarcity+ metabase.query-processor.filter-test/count-with-filter-clause hooks.metabase.test.data/$idsmetabase.query-processor.middleware.cache-test/with-mock-cache! hooks.common/with-two-bindingsmetabase.request.core/with-current-request hooks.common/with-used-first-argmetabase.request.core/with-current-user hooks.common/with-used-first-arg@@ -680,7 +680,7 @@metabase.parameters.chain-filter-test/chain-filter-search macros.metabase.parameters.chain-filter-test/chain-filtermetabase.public-sharing-rest.api-test/with-sharing-enabled-and-temp-card-referencing! macros.metabase.public-sharing-rest.api-test/with-sharing-enabled-and-temp-card-referencing!metabase.public-sharing-rest.api-test/with-sharing-enabled-and-temp-dashcard-referencing! macros.metabase.public-sharing-rest.api-test/with-sharing-enabled-and-temp-dashcard-referencing!- metabase.queries.api.card-test/with-ordered-items macros.metabase.queries.api.card-test/with-ordered-items+ metabase.queries-rest.api.card-test/with-ordered-items macros.metabase.queries-rest.api.card-test/with-ordered-itemsmetabase.query-analysis.models.query-analysis-test/with-test-setup macros.metabase.query-analysis.models.query-analysis-test/with-test-setupmetabase.query-analysis.task.test-setup/with-test-setup! macros.metabase.query-analysis.task.test-setup/with-test-setup!metabase.query-processor.streaming/streaming-response macros.metabase.query-processor.streaming/streaming-responsediff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex e1a2714ee6c..7bb13be531e 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -1021,11 +1021,10 @@queries{:team "Querying"- :api #{metabase.queries.api- metabase.queries.core+ :api #{metabase.queries.coremetabase.queries.initmetabase.queries.models.query ; TODO FIXME- metabase.queries.schema} ; TODO FIXME+ metabase.queries.schema}:uses #{analyticsanalyzeapi@@ -1037,8 +1036,6 @@configcontent-verificationdashboards- eid-translation- embeddingeventsliblib-be@@ -1051,12 +1048,34 @@query-permissionsquery-processorrequest- revisionssearchutilview-logwarehouse-schema}}+ queries-rest+ {:team "Querying"+ :api #{metabase.queries-rest.api}+ :uses #{analyze+ api+ collections+ eid-translation+ embedding+ events+ lib+ lib-be+ models+ parameters+ permissions+ public-sharing+ queries+ query-permissions+ query-processor+ request+ revisions+ search+ util}}+query-permissions{:team "UX West":api #{metabase.query-permissions.core}diff --git a/.clj-kondo/macros/metabase/queries/api/card_test.clj b/.clj-kondo/macros/metabase/queries_rest/api/card_test.cljsimilarity index 88%rename from .clj-kondo/macros/metabase/queries/api/card_test.cljrename to .clj-kondo/macros/metabase/queries_rest/api/card_test.cljindex 0c226c6990e..22c701796a7 100644--- a/.clj-kondo/macros/metabase/queries/api/card_test.clj+++ b/.clj-kondo/macros/metabase/queries_rest/api/card_test.clj@@ -1,4 +1,4 @@-(ns macros.metabase.queries.api.card-test)+(ns macros.metabase.queries-rest.api.card-test)(defmacro with-ordered-items[collection model-and-name-syms & body]diff --git a/.cljfmt.edn b/.cljfmt.ednindex c336dcf3d5f..2bbcda977ee 100644--- a/.cljfmt.edn+++ b/.cljfmt.edn@@ -173,11 +173,11 @@metabase.pulse.dashboard-subscription-test/with-link-card-fixture-for-dashboard [[:block 2]]metabase.pulse.models.pulse-test/with-dashboard-subscription-in-collection [[:block 1]]metabase.pulse.models.pulse-test/with-pulse-in-collection [[:inner 0]]- metabase.queries.api.card-test/with-cards-in-readable-collection [[:block 1]]- metabase.queries.api.card-test/with-cards-in-writeable-collection [[:block 1]]- metabase.queries.api.card-test/with-ordered-items [[:inner 0]]- metabase.queries.api.card-test/with-temp-native-card [[:block 1]]- metabase.queries.api.card-test/with-temp-native-card-with-params [[:block 1]]+ metabase.queries-rest.api.card-test/with-cards-in-readable-collection [[:block 1]]+ metabase.queries-rest.api.card-test/with-cards-in-writeable-collection [[:block 1]]+ metabase.queries-rest.api.card-test/with-ordered-items [[:inner 0]]+ metabase.queries-rest.api.card-test/with-temp-native-card [[:block 1]]+ metabase.queries-rest.api.card-test/with-temp-native-card-with-params [[:block 1]]metabase.query-processor.debug/debug> [[:block 0]]metabase.query-processor.error-type/deferror [[:block 1]]metabase.query-processor.middleware.cache-backend.interface/with-cached-results [[:block 4]]diff --git a/dev/src/dev/deps_graph.clj b/dev/src/dev/deps_graph.cljindex 924ccc00f62..db63f0c5177 100644--- a/dev/src/dev/deps_graph.clj+++ b/dev/src/dev/deps_graph.clj@@ -574,7 +574,8 @@(for [dep deps](-> dep(cond-> (= (:namespace dep) old-namespace)- (assoc :namespace new-namespace))+ (assoc :namespace new-namespace+ :module (module new-namespace)))(update :deps (fn [deps](for [dep deps](if (= (:namespace dep) old-namespace)@@ -667,6 +668,8 @@(defn- indirect-dependents"Set of modules that either directly or indirectly depend on `module`."+ ([module]+ (indirect-dependents (dependencies) module))([deps module](indirect-dependents deps module (sorted-set)))([deps module acc]diff --git a/enterprise/backend/test/metabase_enterprise/sandbox/api/card_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/api/card_test.cljindex e88fbc14a82..830da8cc596 100644--- a/enterprise/backend/test/metabase_enterprise/sandbox/api/card_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sandbox/api/card_test.clj@@ -5,7 +5,7 @@[metabase.permissions.core :as perms][metabase.permissions.models.data-permissions :as data-perms][metabase.permissions.schema :as permissions.schema]- [metabase.queries.api.card-test :as api.card-test]+ [metabase.queries-rest.api.card-test :as api.card-test][metabase.query-processor :as qp][metabase.test :as mt][metabase.util :as u]))diff --git a/frontend/src/metabase/entities/questions.js b/frontend/src/metabase/entities/questions.jsindex c49e1ff4d13..c0fb2f5f164 100644--- a/frontend/src/metabase/entities/questions.js+++ b/frontend/src/metabase/entities/questions.js@@ -190,7 +190,7 @@ const Questions = createEntity({return state;},- // NOTE: keep in sync with src/metabase/queries/api/card.clj+ // NOTE: keep in sync with src/metabase/queries_rest/api/card.cljwritableProperties: ["name","cache_ttl",diff --git a/src/metabase/api/macros/defendpoint/open_api.clj b/src/metabase/api/macros/defendpoint/open_api.cljindex 559e3d43392..3d607c610ed 100644--- a/src/metabase/api/macros/defendpoint/open_api.clj+++ b/src/metabase/api/macros/defendpoint/open_api.clj@@ -227,7 +227,7 @@(metabase.api.macros.defendpoint.open-api/path-item"/api/card/:id/series"- (:form (metabase.api.macros/find-route 'metabase.queries.api.card :get "/:id/series")))+ (:form (metabase.api.macros/find-route 'metabase.queries-rest.api.card :get "/:id/series")))(-> (mjs/transform :metabase.util.cron/CronScheduleString {::mjs/definitions-path "#/components/schemas/"})fix-json-schema))diff --git a/src/metabase/api_routes/routes.clj b/src/metabase/api_routes/routes.cljindex efaf505a7f5..46589ba15c8 100644--- a/src/metabase/api_routes/routes.clj+++ b/src/metabase/api_routes/routes.clj@@ -36,7 +36,7 @@[metabase.product-feedback.api][metabase.public-sharing-rest.api][metabase.pulse.api]- [metabase.queries.api]+ [metabase.queries-rest.api][metabase.query-processor.api][metabase.revisions.api][metabase.search.api]@@ -141,8 +141,8 @@"/bookmark" (+auth 'metabase.bookmarks.api)"/bug-reporting" (+auth 'metabase.bug-reporting.api)"/cache" (+auth 'metabase.cache.api)- "/card" (+auth metabase.queries.api/card-routes)- "/cards" (+auth metabase.queries.api/cards-routes)+ "/card" (+auth metabase.queries-rest.api/card-routes)+ "/cards" (+auth metabase.queries-rest.api/cards-routes)"/channel" (+auth metabase.channel.api/channel-routes)"/cloud-migration" (+auth 'metabase.cloud-migration.api)"/collection" (+auth 'metabase.collections-rest.api)diff --git a/src/metabase/queries/api.clj b/src/metabase/queries/api.cljdeleted file mode 100644index 3e3338a5b1c..00000000000--- a/src/metabase/queries/api.clj+++ /dev/null@@ -1,16 +0,0 @@-(ns metabase.queries.api- (:require- [metabase.api.macros :as api.macros]- [metabase.queries.api.card]- [metabase.queries.api.cards]))--(comment metabase.queries.api.card/keep-me- metabase.queries.api.cards/keep-me)--(def ^{:arglists '([request respond raise])} card-routes- "`/api/card/` routes."- (api.macros/ns-handler 'metabase.queries.api.card))--(def ^{:arglists '([request respond raise])} cards-routes- "`/api/cards/` routes."- (api.macros/ns-handler 'metabase.queries.api.cards))diff --git a/src/metabase/queries/core.clj b/src/metabase/queries/core.cljindex 8dfef06d6ce..7a841c70bd3 100644--- a/src/metabase/queries/core.clj+++ b/src/metabase/queries/core.clj@@ -22,7 +22,8 @@[metabase.queries.models.cardcreate-card!][metabase.queries.metadata- ;; TODO does this belong here, or in the `dashboards` module?+ batch-fetch-card-metadata+ ;; TODO does this belong here, or in the `dashboards` module?batch-fetch-dashboard-metadatabatch-fetch-query-metadata][metabase.queries.models.card@@ -35,7 +36,9 @@;; TODO -- not convinced whether this belongs here or in `permissions`with-can-run-adhoc-query][metabase.queries.models.card.metadata- refresh-metadata]+ maybe-async-result-metadata+ refresh-metadata+ save-metadata-async!][metabase.queries.models.parameter-card][metabase.queries.models.queryaverage-execution-time-msdiff --git a/src/metabase/queries/schema.clj b/src/metabase/queries/schema.cljindex b0ed3e354ff..5cdb31d611a 100644--- a/src/metabase/queries/schema.clj+++ b/src/metabase/queries/schema.clj@@ -52,7 +52,7 @@:any]]);;; TODO (Cam 9/29/25) -- fill this out more, `:metabase.lib.schema.metadata/card` has a lot of stuff and there's also-;;; stuff sprinkled thruout this module. For example [[metabase.queries.api.card/CardUpdateSchema]] should get merged+;;; stuff sprinkled thruout this module. For example [[metabase.queries-rest.api.card/CardUpdateSchema]] should get merged;;; into this;;;;;; TODO (Cam 9/30/25) -- consider renaming this to `:model/Card` so it can serve as the "official" schema of a Carddiff --git a/src/metabase/queries_rest/api.clj b/src/metabase/queries_rest/api.cljnew file mode 100644index 00000000000..8e64c52be49--- /dev/null+++ b/src/metabase/queries_rest/api.clj@@ -0,0 +1,16 @@+(ns metabase.queries-rest.api+ (:require+ [metabase.api.macros :as api.macros]+ [metabase.queries-rest.api.card]+ [metabase.queries-rest.api.cards]))++(comment metabase.queries-rest.api.card/keep-me+ metabase.queries-rest.api.cards/keep-me)++(def ^{:arglists '([request respond raise])} card-routes+ "`/api/card/` routes."+ (api.macros/ns-handler 'metabase.queries-rest.api.card))++(def ^{:arglists '([request respond raise])} cards-routes+ "`/api/cards/` routes."+ (api.macros/ns-handler 'metabase.queries-rest.api.cards))diff --git a/src/metabase/queries/api/card.clj b/src/metabase/queries_rest/api/card.cljsimilarity index 96%rename from src/metabase/queries/api/card.cljrename to src/metabase/queries_rest/api/card.cljindex e82b1c3f19c..9b80971e5d4 100644--- a/src/metabase/queries/api/card.clj+++ b/src/metabase/queries_rest/api/card.clj@@ -1,4 +1,4 @@-(ns metabase.queries.api.card+(ns metabase.queries-rest.api.card"/api/card endpoints."(:require[medley.core :as m]@@ -19,10 +19,7 @@[metabase.parameters.schema :as parameters.schema][metabase.permissions.core :as perms][metabase.public-sharing.validation :as public-sharing.validation]- [metabase.queries.card :as queries.card]- [metabase.queries.metadata :as queries.metadata]- [metabase.queries.models.card :as card]- [metabase.queries.models.card.metadata :as card.metadata]+ [metabase.queries.core :as queries][metabase.queries.schema :as queries.schema][metabase.query-permissions.core :as query-perms][metabase.query-processor.api :as api.dataset]@@ -201,7 +198,7 @@[{card-id :id :as card}](span/with-span!{:name "hydrate-card-details"- :attributes {:card/id card-id}}+ :attributes {:queries/id card-id}}(-> card(t2/hydrate :based_on_upload:creator@@ -220,9 +217,9 @@:is_remote_synced)(update :dashboard #(some-> % (select-keys [:name :id :moderation_status])))(cond->- (card/model? card) (t2/hydrate :persisted- ;; can_manage_db determines whether we should enable model persistence settings- :can_manage_db)))))+ (queries/model? card) (t2/hydrate :persisted+ ;; can_manage_db determines whether we should enable model persistence settings+ :can_manage_db)))))(defn- get-card"Get `Card` with ID."@@ -560,7 +557,7 @@(lib/check-card-overwrite ::no-id query)(catch clojure.lang.ExceptionInfo e(throw (ex-info (ex-message e) (assoc (ex-data e) :status-code 400)))))- (-> (card/create-card! card @api/*current-user*)+ (-> (queries/create-card! card @api/*current-user*)hydrate-card-details(assoc :last-edit-info (revisions/edit-information-for-user @api/*current-user*)))))@@ -575,7 +572,7 @@(let [orig-card (api/read-check :model/Card id)new-name (trs "Copy of {0}" (:name orig-card))new-card (assoc orig-card :name new-name)]- (-> (card/create-card! new-card @api/*current-user*)+ (-> (queries/create-card! new-card @api/*current-user*)hydrate-card-details(assoc :last-edit-info (revisions/edit-information-for-user @api/*current-user*)))))@@ -668,15 +665,15 @@card-before-update(api/updates-with-archived-directly card-before-update card-updates))is-model-after-update? (if (nil? card-type)- (card/model? card-before-update)- (card/model? card-updates))]+ (queries/model? card-before-update)+ (queries/model? card-updates))];; Do various permissions checks(doseq [f [check-update-result-metadata-data-permscheck-allowed-to-movecheck-allowed-to-modify-querycheck-allowed-to-change-embedding]](f card-before-update card-updates))- (let [{:keys [metadata metadata-future]} (card.metadata/maybe-async-result-metadata+ (let [{:keys [metadata metadata-future]} (queries/maybe-async-result-metadata{:original-query (:dataset_query card-before-update):query query:metadata metadata@@ -702,10 +699,10 @@metadata(assoc :result_metadata metadata:verified-result-metadata? true))- card (-> (card/update-card! {:card-before-update card-before-update- :card-updates card-updates- :actor @api/*current-user*- :delete-old-dashcards? delete-old-dashcards?})+ card (-> (queries/update-card! {:card-before-update card-before-update+ :card-updates card-updates+ :actor @api/*current-user*+ :delete-old-dashcards? delete-old-dashcards?})hydrate-card-details(assoc :last-edit-info (revisions/edit-information-for-user @api/*current-user*)))];; We expose the search results for models and metrics directly in FE grids, from which items can be archived.@@ -721,7 +718,7 @@[search-model [:= :this.id id]])))(when metadata-future(log/infof "Metadata not available soon enough. Saving card %s and asynchronously updating metadata" id)- (card.metadata/save-metadata-async! metadata-future card))+ (queries/save-metadata-async! metadata-future card))card))));; TODO (Cam 10/28/25) -- fix this endpoint so it uses kebab-case for query parameters for consistency with the rest@@ -754,7 +751,7 @@[:id [:or ms/PositiveInt ms/NanoIdString]]]](lib-be/with-metadata-provider-cache(let [resolved-id (eid-translation/->id-or-404 :card id)]- (queries.metadata/batch-fetch-card-metadata [(get-card resolved-id)]))))+ (queries/batch-fetch-card-metadata [(get-card resolved-id)]))));;; ------------------------------------------------- Deleting Cards -------------------------------------------------@@ -763,7 +760,7 @@;;#_{:clj-kondo/ignore [:metabase/validate-defendpoint-has-response-schema]}(api.macros/defendpoint :delete "/:id"- "Hard delete a Card. To soft delete, use `PUT /api/card/:id`"+ "Hard delete a Card. To soft delete, use `PUT /api/queries/:id`"[{:keys [id]} :- [:map[:id ms/PositiveInt]]](let [card (api/write-check :model/Card id)]@@ -879,7 +876,7 @@[:dashboard_id {:optional true} [:maybe ms/PositiveInt]]]];; TODO -- we should probably warn if you pass `dashboard_id`, and tell you to use the new;;- ;; POST /api/dashboard/:dashboard-id/card/:card-id/query+ ;; POST /api/dashboard/:dashboard-id/queries/:card-id/query;;;; endpoint instead. Or error in that situtation? We're not even validating that you have access to this Dashboard.(let [resolved-card-id (eid-translation/->id-or-404 :card card-id)]@@ -1011,11 +1008,11 @@"Fetch possible values of the parameter whose ID is `:param-key`.;; fetch values for Card 1 parameter 'abc' that are possible- GET /api/card/1/params/abc/values"+ GET /api/queries/1/params/abc/values"[{:keys [card-id param-key]} :- [:map[:card-id ms/PositiveInt][:param-key ::lib.schema.parameter/id]]]- (queries.card/card-param-values (api/read-check :model/Card card-id) param-key))+ (queries/card-param-values (api/read-check :model/Card card-id) param-key));; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to;; use our API + we will need it when we make auto-TypeScript-signature generation happen@@ -1025,14 +1022,14 @@"Fetch possible values of the parameter whose ID is `:param-key` that contain `:query`.;; fetch values for Card 1 parameter 'abc' that contain 'Orange';- GET /api/card/1/params/abc/search/Orange+ GET /api/queries/1/params/abc/search/OrangeCurrently limited to first 1000 results."[{:keys [card-id param-key query]} :- [:map[:card-id ms/PositiveInt][:param-key ::lib.schema.parameter/id][:query ms/NonBlankString]]]- (queries.card/card-param-values (api/read-check :model/Card card-id) param-key query))+ (queries/card-param-values (api/read-check :model/Card card-id) param-key query));; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to;; use our API + we will need it when we make auto-TypeScript-signature generation happen@@ -1042,10 +1039,10 @@"Fetch the remapped value for a given value of the parameter with ID `:param-key`.;; fetch the remapped value for Card 1 parameter 'abc' for value 100- GET /api/card/1/params/abc/remapping?value=100"+ GET /api/queries/1/params/abc/remapping?value=100"[{:keys [id param-key]} :- [:map[:id ::lib.schema.id/card][:param-key ::lib.schema.parameter/id]]{:keys [value]} :- [:map [:value :string]]](-> (api/read-check :model/Card id)- (queries.card/card-param-remapped-value param-key (codec/url-decode value))))+ (queries/card-param-remapped-value param-key (codec/url-decode value))))diff --git a/src/metabase/queries/api/cards.clj b/src/metabase/queries_rest/api/cards.cljsimilarity index 96%rename from src/metabase/queries/api/cards.cljrename to src/metabase/queries_rest/api/cards.cljindex 0c00168548a..da2ecac3ffc 100644--- a/src/metabase/queries/api/cards.clj+++ b/src/metabase/queries_rest/api/cards.clj@@ -1,9 +1,9 @@-(ns metabase.queries.api.cards+(ns metabase.queries-rest.api.cards"Bulk endpoints for Cards"(:require[metabase.api.macros :as api.macros][metabase.models.interface :as mi]- [metabase.queries.api.card :as api.card]+ [metabase.queries-rest.api.card :as api.card][metabase.util.malli.schema :as ms][toucan2.core :as t2]))diff --git a/test/metabase/api/trash_test.clj b/test/metabase/api/trash_test.cljindex 1878f5bddb1..acbf2b99ce6 100644--- a/test/metabase/api/trash_test.clj+++ b/test/metabase/api/trash_test.clj@@ -2,7 +2,7 @@(:require[clojure.test :refer [deftest testing is]][metabase.collections.models.collection :as collection]- [metabase.queries.api.card-test :refer [card-with-name-and-query]]+ [metabase.queries-rest.api.card-test :refer [card-with-name-and-query]][metabase.test :as mt]))(def dashboard-defaults {:name "Dashboard"diff --git a/test/metabase/collections_rest/api_test.clj b/test/metabase/collections_rest/api_test.cljindex 44e7e27b23c..a420f39a208 100644--- a/test/metabase/collections_rest/api_test.clj+++ b/test/metabase/collections_rest/api_test.clj@@ -14,7 +14,7 @@[metabase.permissions.models.collection-permission-graph-revision :as c-perm-revision][metabase.permissions.models.collection.graph :as graph][metabase.permissions.models.collection.graph-test :as graph.test]- [metabase.queries.api.card-test :as api.card-test]+ [metabase.queries-rest.api.card-test :as api.card-test][metabase.queries.models.card :as card][metabase.revisions.models.revision :as revision][metabase.test :as mt]diff --git a/test/metabase/dashboards_rest/api_test.clj b/test/metabase/dashboards_rest/api_test.cljindex 5fc5ac965b2..66a74991816 100644--- a/test/metabase/dashboards_rest/api_test.clj+++ b/test/metabase/dashboards_rest/api_test.clj@@ -33,7 +33,7 @@[metabase.permissions.test-util :as perms.test-util][metabase.pulse.dashboard-subscription-test :as dashboard-subscription-test][metabase.pulse.models.pulse :as models.pulse]- [metabase.queries.api.card-test :as api.card-test]+ [metabase.queries-rest.api.card-test :as api.card-test][metabase.query-processor :as qp][metabase.query-processor.middleware.permissions :as qp.perms][metabase.query-processor.pivot.test-util :as api.pivots]diff --git a/test/metabase/embedding_rest/api/embed_test.clj b/test/metabase/embedding_rest/api/embed_test.cljindex 2ec4c6729db..1eb820468d1 100644--- a/test/metabase/embedding_rest/api/embed_test.clj+++ b/test/metabase/embedding_rest/api/embed_test.clj@@ -16,7 +16,7 @@[metabase.parameters.chain-filter-test :as chain-filer-test][metabase.parameters.custom-values :as custom-values][metabase.public-sharing-rest.api-test :as public-test]- [metabase.queries.api.card-test :as api.card-test]+ [metabase.queries-rest.api.card-test :as api.card-test][metabase.query-processor.middleware.constraints :as qp.constraints][metabase.query-processor.middleware.process-userland-query-test :as process-userland-query-test][metabase.query-processor.pivot.test-util :as api.pivots]diff --git a/test/metabase/lib/card_test.cljc b/test/metabase/lib/card_test.cljcindex ca0e27f7e89..f0921ed47f5 100644--- a/test/metabase/lib/card_test.cljc+++ b/test/metabase/lib/card_test.cljc@@ -358,7 +358,7 @@:dataset-query query:result-metadata (result-metadata-fn (lib/query mp query))})]}))))-;;; adapted from [[metabase.queries.api.card-test/model-card-test-2]]+;;; adapted from [[metabase.queries-rest.api.card-test/model-card-test-2]](deftest ^:parallel preserve-edited-metadata-test(testing "Cards preserve their edited metadata"(doseq [result-metadata-style [::mlv2-returned-columns ::mlv2-expected-columns ::legacy-snake-case-qp]]diff --git a/test/metabase/lib/field/resolution_test.cljc b/test/metabase/lib/field/resolution_test.cljcindex de5712cf52c..e5e8ae4c14d 100644--- a/test/metabase/lib/field/resolution_test.cljc+++ b/test/metabase/lib/field/resolution_test.cljc@@ -723,7 +723,7 @@{:display-name "Sum of Total"}](lib/returned-columns query))))))))-;;; adapted from [[metabase.queries.api.card-test/model-card-test-2]]+;;; adapted from [[metabase.queries-rest.api.card-test/model-card-test-2]](deftest ^:parallel preserve-model-metadata-test(let [mp (metabase.lib.card-test/preserve-edited-metadata-test-mock-metadata-provider{:result-metadata-style :metabase.lib.card-test/legacy-snake-case-qp})diff --git a/test/metabase/public_sharing_rest/api_test.clj b/test/metabase/public_sharing_rest/api_test.cljindex 747eeb921be..8cab8f6b08f 100644--- a/test/metabase/public_sharing_rest/api_test.clj+++ b/test/metabase/public_sharing_rest/api_test.clj@@ -15,7 +15,7 @@[metabase.permissions.models.permissions :as perms][metabase.permissions.models.permissions-group :as perms-group][metabase.public-sharing-rest.api :as api.public]- [metabase.queries.api.card-test :as api.card-test]+ [metabase.queries-rest.api.card-test :as api.card-test][metabase.query-processor.card-test :as qp.card-test][metabase.query-processor.middleware.process-userland-query-test :as process-userland-query-test][metabase.query-processor.pivot.test-util :as api.pivots]diff --git a/test/metabase/pulse/api/pulse_test.clj b/test/metabase/pulse/api/pulse_test.cljindex 7dc9514293b..2390ae34791 100644--- a/test/metabase/pulse/api/pulse_test.clj+++ b/test/metabase/pulse/api/pulse_test.clj@@ -18,7 +18,7 @@[metabase.pulse.models.pulse-channel :as pulse-channel][metabase.pulse.models.pulse-test :as pulse-test][metabase.pulse.test-util :as pulse.test-util]- [metabase.queries.api.card-test :as api.card-test]+ [metabase.queries-rest.api.card-test :as api.card-test][metabase.test :as mt][metabase.test.data.interface :as tx][metabase.test.http-client :as client]diff --git a/test/metabase/queries/api/card_test.clj b/test/metabase/queries_rest/api/card_test.cljsimilarity index 99%rename from test/metabase/queries/api/card_test.cljrename to test/metabase/queries_rest/api/card_test.cljindex 4f8ec78c56f..204b7bcc048 100644--- a/test/metabase/queries/api/card_test.clj+++ b/test/metabase/queries_rest/api/card_test.clj@@ -1,4 +1,4 @@-(ns ^:mb/driver-tests metabase.queries.api.card-test+(ns ^:mb/driver-tests metabase.queries-rest.api.card-test"Tests for /api/card endpoints."(:require[clojure.data.csv :as csv]@@ -29,7 +29,7 @@[metabase.permissions.models.permissions :as perms][metabase.permissions.models.permissions-group :as perms-group][metabase.permissions.util :as perms.u]- [metabase.queries.api.card :as api.card]+ [metabase.queries-rest.api.card :as api.card][metabase.queries.card :as queries.card][metabase.queries.models.card.metadata :as card.metadata][metabase.query-processor.card :as qp.card]@@ -703,7 +703,7 @@(deftest ^:parallel doc-test(testing "Make sure generated docstring resolves Malli schemas in the registry correctly (#46799)"- (let [openapi-object (open-api/open-api-spec (api.macros/ns-handler 'metabase.queries.api.card) "/api/card")+ (let [openapi-object (open-api/open-api-spec (api.macros/ns-handler 'metabase.queries-rest.api.card) "/api/card")schemas (get-in openapi-object [:components :schemas])body-properties (get-in openapi-object [:paths "/api/card/" :post :requestBody :content "application/json" :schema :properties])_ (is (some? body-properties))diff --git a/test/metabase/queries/api/cards_test.clj b/test/metabase/queries_rest/api/cards_test.cljsimilarity index 99%rename from test/metabase/queries/api/cards_test.cljrename to test/metabase/queries_rest/api/cards_test.cljindex 3aefaff7b60..a0562b8980d 100644--- a/test/metabase/queries/api/cards_test.clj+++ b/test/metabase/queries_rest/api/cards_test.clj@@ -1,4 +1,4 @@-(ns metabase.queries.api.cards-test+(ns metabase.queries-rest.api.cards-test(:require[clojure.test :refer :all][metabase.permissions.models.permissions :as perms]diff --git a/test/metabase/query_processor/card_test.clj b/test/metabase/query_processor/card_test.cljindex f6f99979dd8..ba9161ca8ee 100644--- a/test/metabase/query_processor/card_test.clj+++ b/test/metabase/query_processor/card_test.clj@@ -1,5 +1,5 @@(ns metabase.query-processor.card-test- "There are more e2e tests in [[metabase.queries.api.card-test]]."+ "There are more e2e tests in [[metabase.queries-rest.api.card-test]]."{:clj-kondo/config '{:linters;; allowing `with-temp` here for now since this tests the REST API which doesn't fully use;; metadata providers.@@ -304,7 +304,7 @@#_{:clj-kondo/ignore [:deprecated-var]}(qp.store/miscellaneous-value [::qp.results-metadata/card-stored-metadata]))))))))-;;; adapted from [[metabase.queries.api.card-test/model-card-test-2]]+;;; adapted from [[metabase.queries-rest.api.card-test/model-card-test-2]](deftest ^:parallel preserve-model-metadata-test(testing "Cards preserve their edited metadata"(letfn [(base-type->semantic-type [base-type]diff --git a/test/metabase/query_processor/preprocess_test.clj b/test/metabase/query_processor/preprocess_test.cljindex 3239fa82bfa..4635a5002f0 100644--- a/test/metabase/query_processor/preprocess_test.clj+++ b/test/metabase/query_processor/preprocess_test.clj@@ -236,7 +236,7 @@{:display_name "Sum of Total"}](qp.preprocess/query->expected-cols query))))))-;;; adapted from [[metabase.queries.api.card-test/model-card-test-2]]+;;; adapted from [[metabase.queries-rest.api.card-test/model-card-test-2]];;; and [[metabase.lib.card-test/preserve-edited-metadata-test]](deftest ^:parallel preserve-edited-metadata-test(testing "Cards preserve their edited metadata"diff --git a/test/metabase/search/impl_test.clj b/test/metabase/search/impl_test.cljindex c94368ce5ce..6d50e462811 100644--- a/test/metabase/search/impl_test.clj+++ b/test/metabase/search/impl_test.clj@@ -7,7 +7,7 @@[java-time.api :as t][metabase.api.common :as api][metabase.config.core :as config]- [metabase.queries.api.card :as api.card]+ [metabase.queries-rest.api.card :as api.card][metabase.search.appdb.index :as search.index][metabase.search.config :as search.config][metabase.search.core :as search]