Skip to content

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

Reorganize QP module (#70808)

metamben84b79b912645
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index d5be77254a5..f6bc2fe3084 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -1600,45 +1600,37 @@
:model-imports #{:model/Card :model/Field}}
query-processor
- {:team "Querying"
- :api #{metabase.query-processor
- metabase.query-processor.api
- metabase.query-processor.card
- metabase.query-processor.compile
- metabase.query-processor.dashboard
- metabase.query-processor.debug
- metabase.query-processor.error-type
- metabase.query-processor.init
- metabase.query-processor.interface
- metabase.query-processor.metadata
- metabase.query-processor.middleware.add-remaps
- metabase.query-processor.middleware.annotate
- metabase.query-processor.middleware.cache-backend.db
- metabase.query-processor.middleware.catch-exceptions
- metabase.query-processor.middleware.constraints
- metabase.query-processor.middleware.limit
- metabase.query-processor.middleware.permissions
- metabase.query-processor.middleware.wrap-value-literals
- metabase.query-processor.parameters.dates
- metabase.query-processor.parameters.operators
- metabase.query-processor.pipeline
- metabase.query-processor.pivot
- metabase.query-processor.preprocess
- metabase.query-processor.reducible
- metabase.query-processor.schema
- metabase.query-processor.setup
- metabase.query-processor.store
- metabase.query-processor.streaming
- metabase.query-processor.streaming.common
- metabase.query-processor.streaming.interface
- metabase.query-processor.timezone
- metabase.query-processor.util
- metabase.query-processor.util.add-alias-info
- metabase.query-processor.util.nest-query
- metabase.query-processor.util.persisted-cache
- metabase.query-processor.util.relative-datetime
- metabase.query-processor.util.transformations.nest-breakouts
- metabase.query-processor.writeback}
+ {:team "Querying"
+ :friends #{driver-api
+ enterprise/cache
+ enterprise/sandbox
+ parameters
+ transforms-base
+ warehouse-schema}
+ :api #{metabase.query-processor.api
+ metabase.query-processor.card
+ metabase.query-processor.compile
+ metabase.query-processor.core
+ metabase.query-processor.dashboard
+ metabase.query-processor.error-type
+ metabase.query-processor.init
+ metabase.query-processor.interface
+ metabase.query-processor.metadata
+ metabase.query-processor.middleware.constraints
+ metabase.query-processor.middleware.permissions
+ metabase.query-processor.parameters.dates
+ metabase.query-processor.parameters.operators
+ metabase.query-processor.pipeline
+ metabase.query-processor.pivot
+ metabase.query-processor.preprocess
+ metabase.query-processor.schema
+ metabase.query-processor.store
+ metabase.query-processor.streaming
+ metabase.query-processor.streaming.common
+ metabase.query-processor.streaming.interface
+ metabase.query-processor.timezone
+ metabase.query-processor.util
+ metabase.query-processor.util.persisted-cache}
:uses #{analytics
analyze
api
diff --git a/dev/src/dev/api/preview.clj b/dev/src/dev/api/preview.clj
index c87b81e2cc6..a926b3c0c6d 100644
--- a/dev/src/dev/api/preview.clj
+++ b/dev/src/dev/api/preview.clj
@@ -10,7 +10,7 @@
[metabase.api.routes.common]
[metabase.channel.render.core :as channel.render]
[metabase.channel.urls :as urls]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.middleware.permissions :as qp.perms]
[metabase.util.malli.schema :as ms])
(:import
diff --git a/dev/src/dev/render_png.clj b/dev/src/dev/render_png.clj
index b9d45dc6bcb..0160d8e4759 100644
--- a/dev/src/dev/render_png.clj
+++ b/dev/src/dev/render_png.clj
@@ -12,7 +12,7 @@
[metabase.channel.render.png :as png]
[metabase.channel.render.style :as style]
[metabase.notification.payload.core :as notification.payload]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.test :as mt]
[metabase.util.markdown :as markdown]
[toucan2.core :as t2])
diff --git a/enterprise/backend/src/metabase_enterprise/action_v2/data_editing.clj b/enterprise/backend/src/metabase_enterprise/action_v2/data_editing.clj
index fe711b254f1..5ba83735550 100644
--- a/enterprise/backend/src/metabase_enterprise/action_v2/data_editing.clj
+++ b/enterprise/backend/src/metabase_enterprise/action_v2/data_editing.clj
@@ -8,7 +8,7 @@
[metabase.api.common :as api]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
;; legacy usage -- don't do things like this going forward
^{:clj-kondo/ignore [:deprecated-namespace :discouraged-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.util :as u]
diff --git a/enterprise/backend/src/metabase_enterprise/agent_api/api.clj b/enterprise/backend/src/metabase_enterprise/agent_api/api.clj
index bc401a45764..8de3e26c9ff 100644
--- a/enterprise/backend/src/metabase_enterprise/agent_api/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/agent_api/api.clj
@@ -18,7 +18,7 @@
[metabase.api.routes.common :as api.routes.common]
[metabase.api.util.handlers :as handlers]
[metabase.auth-identity.core :as auth-identity]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.streaming :as qp.streaming]
[metabase.request.core :as request]
[metabase.server.streaming-response :as streaming-response]
diff --git a/enterprise/backend/src/metabase_enterprise/cache/task/refresh_cache_configs.clj b/enterprise/backend/src/metabase_enterprise/cache/task/refresh_cache_configs.clj
index dcbf2380212..8627ce3ff6f 100644
--- a/enterprise/backend/src/metabase_enterprise/cache/task/refresh_cache_configs.clj
+++ b/enterprise/backend/src/metabase_enterprise/cache/task/refresh_cache_configs.clj
@@ -6,7 +6,7 @@
[java-time.api :as t]
[metabase-enterprise.cache.strategies :as strategies]
[metabase.premium-features.core :as premium-features :refer [defenterprise]]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.task.core :as task]
[metabase.util.log :as log]
[toucan2.core :as t2])
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/api/document.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/api/document.clj
index db44f8a3319..0cb70503c93 100644
--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/api/document.clj
+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/api/document.clj
@@ -9,7 +9,7 @@
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.util.malli.schema :as ms]
[metabase.warehouses.core :as warehouses]))
diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/query.clj b/enterprise/backend/src/metabase_enterprise/slackbot/query.clj
index 69d815e1686..f1e827770ea 100644
--- a/enterprise/backend/src/metabase_enterprise/slackbot/query.clj
+++ b/enterprise/backend/src/metabase_enterprise/slackbot/query.clj
@@ -5,7 +5,7 @@
[metabase.channel.render.core :as channel.render]
[metabase.formatter.core :as formatter]
[metabase.lib.core :as lib]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.middleware.permissions :as qp.perms]
[metabase.query-processor.schema :as qp.schema]
[metabase.util :as u]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms_inspector/api.clj b/enterprise/backend/src/metabase_enterprise/transforms_inspector/api.clj
index 34522d89824..0a980689822 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms_inspector/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms_inspector/api.clj
@@ -7,7 +7,7 @@
[metabase.api.routes.common :refer [+auth]]
[metabase.api.util.handlers :as handlers]
[metabase.events.core :as events]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.middleware.constraints :as qp.constraints]
[metabase.query-processor.schema :as qp.schema]
[metabase.query-processor.streaming :as qp.streaming]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms_python/python_runner.clj b/enterprise/backend/src/metabase_enterprise/transforms_python/python_runner.clj
index d8249805e4a..60da7f744e8 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms_python/python_runner.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms_python/python_runner.clj
@@ -12,7 +12,7 @@
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.pipeline :as qp.pipeline]
[metabase.transforms-base.util :as transforms-base.u]
[metabase.transforms.instrumentation :as transforms.instrumentation]
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/execute.clj b/enterprise/backend/src/metabase_enterprise/workspaces/execute.clj
index 3226b7a670a..993b8041c68 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/execute.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/execute.clj
@@ -6,7 +6,7 @@
(:require
[clojure.string :as str]
[metabase-enterprise.transforms-python.python-runner :as python-runner]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.transforms-base.core :as transforms-base]
[metabase.transforms-base.util :as transforms-base.u]
[metabase.util.log :as log]
diff --git a/enterprise/backend/test/metabase_enterprise/action_v2/api_test.clj b/enterprise/backend/test/metabase_enterprise/action_v2/api_test.clj
index 6b77e656048..e79dbe4d46b 100644
--- a/enterprise/backend/test/metabase_enterprise/action_v2/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/action_v2/api_test.clj
@@ -13,7 +13,7 @@
[metabase.driver :as driver]
[metabase.driver.sql-jdbc :as sql-jdbc]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.sql :as sql.tx]
[metabase.warehouse-schema.models.field-values :as field-values]
diff --git a/enterprise/backend/test/metabase_enterprise/action_v2/models/undo_test.clj b/enterprise/backend/test/metabase_enterprise/action_v2/models/undo_test.clj
index a51fef8e9ec..dbf94ce172d 100644
--- a/enterprise/backend/test/metabase_enterprise/action_v2/models/undo_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/action_v2/models/undo_test.clj
@@ -3,7 +3,7 @@
[clojure.test :refer :all]
[metabase-enterprise.action-v2.models.undo :as undo]
[metabase-enterprise.action-v2.test-util :as action-v2.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/block_permissions_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/block_permissions_test.clj
index d445613a7ee..0bf2ebd4a46 100644
--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/block_permissions_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions/block_permissions_test.clj
@@ -10,8 +10,8 @@
[metabase.permissions.core :as perms]
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.permissions :as qp.perms]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[toucan2.core :as t2])
diff --git a/enterprise/backend/test/metabase_enterprise/audit_app/pages/common_test.clj b/enterprise/backend/test/metabase_enterprise/audit_app/pages/common_test.clj
index 9e48e6b7f83..131a49a17aa 100644
--- a/enterprise/backend/test/metabase_enterprise/audit_app/pages/common_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/audit_app/pages/common_test.clj
@@ -3,7 +3,7 @@
[clojure.test :refer :all]
[metabase-enterprise.audit-app.interface :as audit.i]
[metabase-enterprise.audit-app.pages.common :as common]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/enterprise/backend/test/metabase_enterprise/audit_app/pages_test.clj b/enterprise/backend/test/metabase_enterprise/audit_app/pages_test.clj
index 154b751b5c7..6e0a474d559 100644
--- a/enterprise/backend/test/metabase_enterprise/audit_app/pages_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/audit_app/pages_test.clj
@@ -8,7 +8,7 @@
[clojure.tools.reader :as tools.reader]
[metabase-enterprise.audit-app.interface :as audit.i]
[metabase.classloader.core :as classloader]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util :as qp.util]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
diff --git a/enterprise/backend/test/metabase_enterprise/audit_app/permissions_test.clj b/enterprise/backend/test/metabase_enterprise/audit_app/permissions_test.clj
index 6470f4ad2a9..52e9f28cde7 100644
--- a/enterprise/backend/test/metabase_enterprise/audit_app/permissions_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/audit_app/permissions_test.clj
@@ -12,7 +12,7 @@
[metabase.permissions.models.collection.graph :refer [update-graph!]]
[metabase.permissions.models.collection.graph-test :refer [graph]]
[metabase.permissions.models.data-permissions :as data-perms]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
diff --git a/enterprise/backend/test/metabase_enterprise/audit_app/query_processor/middleware/handle_audit_queries_test.clj b/enterprise/backend/test/metabase_enterprise/audit_app/query_processor/middleware/handle_audit_queries_test.clj
index 504054c559a..cb110d8a6ee 100644
--- a/enterprise/backend/test/metabase_enterprise/audit_app/query_processor/middleware/handle_audit_queries_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/audit_app/query_processor/middleware/handle_audit_queries_test.clj
@@ -3,7 +3,7 @@
(:require
[clojure.test :refer :all]
[metabase-enterprise.audit-app.interface :as audit.i]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/enterprise/backend/test/metabase_enterprise/cache/strategies_test.clj b/enterprise/backend/test/metabase_enterprise/cache/strategies_test.clj
index e97453ecbd1..2fc8230c02b 100644
--- a/enterprise/backend/test/metabase_enterprise/cache/strategies_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/cache/strategies_test.clj
@@ -5,8 +5,8 @@
[metabase-enterprise.cache.strategies :as strategies]
[metabase-enterprise.cache.task.refresh-cache-configs :as task.cache]
[metabase.queries.models.query :as query]
- [metabase.query-processor :as qp]
[metabase.query-processor.card :as qp.card]
+ [metabase.query-processor.test :as qp]
[metabase.search.ingestion :as search.ingestion]
[metabase.test :as mt]))
diff --git a/enterprise/backend/test/metabase_enterprise/cache/task/refresh_cache_configs_test.clj b/enterprise/backend/test/metabase_enterprise/cache/task/refresh_cache_configs_test.clj
index 7bb3de10893..acedd1f5c68 100644
--- a/enterprise/backend/test/metabase_enterprise/cache/task/refresh_cache_configs_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/cache/task/refresh_cache_configs_test.clj
@@ -5,8 +5,8 @@
[medley.core :as m]
[metabase-enterprise.cache.task.refresh-cache-configs :as task.cache]
[metabase.premium-features.core :as premium-features]
- [metabase.query-processor :as qp]
[metabase.query-processor.card :as qp.card]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util :as qp.util]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
diff --git a/enterprise/backend/test/metabase_enterprise/database_routing/e2e_test.clj b/enterprise/backend/test/metabase_enterprise/database_routing/e2e_test.clj
index 00bb928e250..dac3ce6b83b 100644
--- a/enterprise/backend/test/metabase_enterprise/database_routing/e2e_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/database_routing/e2e_test.clj
@@ -10,7 +10,7 @@
[metabase.driver :as driver]
[metabase.driver.settings :as driver.settings]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.sync.task.sync-databases :as task.sync-databases]
[metabase.test :as mt]
diff --git a/enterprise/backend/test/metabase_enterprise/impersonation/cache_test.clj b/enterprise/backend/test/metabase_enterprise/impersonation/cache_test.clj
index 4318a0e3225..07c7219c493 100644
--- a/enterprise/backend/test/metabase_enterprise/impersonation/cache_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/impersonation/cache_test.clj
@@ -3,8 +3,8 @@
[clojure.core.async :as a]
[clojure.test :refer [deftest testing is]]
[metabase-enterprise.impersonation.util-test :as impersonation.util-test]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.cache-test :as cache-test]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest impersonated-users-get-a-different-cache
diff --git a/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj b/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
index a51ba0cfd13..978d91fc081 100644
--- a/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
@@ -13,7 +13,7 @@
[metabase.driver.settings :as driver.settings]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.request.core :as request]
[metabase.sync.core :as sync]
[metabase.test :as mt]
diff --git a/enterprise/backend/test/metabase_enterprise/sandbox/api/card_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/api/card_test.clj
index 2bf83555de8..75f06238c1e 100644
--- a/enterprise/backend/test/metabase_enterprise/sandbox/api/card_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sandbox/api/card_test.clj
@@ -6,7 +6,7 @@
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.schema :as permissions.schema]
[metabase.queries-rest.api.card-test :as api.card-test]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/enterprise/backend/test/metabase_enterprise/sandbox/pulse_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/pulse_test.clj
index 8b3e651f5c8..da861817dca 100644
--- a/enterprise/backend/test/metabase_enterprise/sandbox/pulse_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sandbox/pulse_test.clj
@@ -12,7 +12,7 @@
[metabase.pulse.api.pulse :as api.pulse]
[metabase.pulse.models.pulse :as models.pulse]
[metabase.pulse.send :as pulse.send]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/sandboxing_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/sandboxing_test.clj
index 63835999d15..72915c6a82e 100644
--- a/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/sandboxing_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/sandboxing_test.clj
@@ -18,7 +18,6 @@
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.cache-test :as cache-test]
[metabase.query-processor.middleware.permissions :as qp.perms]
[metabase.query-processor.middleware.process-userland-query-test :as process-userland-query-test]
@@ -26,6 +25,7 @@
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.query-processor.streaming.test-util :as streaming.test-util]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util :as qp.util]
[metabase.query-processor.util.add-alias-info :as add]
[metabase.request.core :as request]
diff --git a/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/update_used_cards_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/update_used_cards_test.clj
index 61e088c5baf..6c7b0a7e937 100644
--- a/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/update_used_cards_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sandbox/query_processor/middleware/update_used_cards_test.clj
@@ -2,8 +2,8 @@
(:require
[clojure.test :refer :all]
[metabase-enterprise.test :as met]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.update-used-cards-test :as qp.updated-used-cards-test]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
index f33217dcfdc..dc9bd2dccfc 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
@@ -14,7 +14,7 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.models.serialization :as serdes]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.search.test-util :as search.tu]
[metabase.test :as mt]
[metabase.util :as u]
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
index 15e3fbcf10b..180262dec43 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
@@ -13,7 +13,7 @@
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.transforms-base.util :as transforms-base.u]
[metabase.transforms.execute :as transforms.execute]
diff --git a/modules/drivers/athena/test/metabase/driver/athena_test.clj b/modules/drivers/athena/test/metabase/driver/athena_test.clj
index 81a9e3a9412..5654655bd8d 100644
--- a/modules/drivers/athena/test/metabase/driver/athena_test.clj
+++ b/modules/drivers/athena/test/metabase/driver/athena_test.clj
@@ -11,8 +11,8 @@
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
[metabase.premium-features.core :as premium-features]
- [metabase.query-processor :as qp]
[metabase.query-processor.date-time-zone-functions-test :as qp-test.date-time-zone-functions-test]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.sync.core :as sync]
[metabase.test :as mt]
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/params_test.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/params_test.clj
index 022e27e622b..46d664a2e4e 100644
--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/params_test.clj
+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/params_test.clj
@@ -1,7 +1,7 @@
(ns ^:mb/driver-tests metabase.driver.bigquery-cloud-sdk.params-test
(:require
[clojure.test :refer :all]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(set! *warn-on-reflection* true)
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj
index e5a694a3636..79281e6d35f 100644
--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj
+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj
@@ -14,10 +14,10 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util.add-alias-info :as add]
[metabase.sync.core :as sync]
[metabase.test :as mt]
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
index e4d7c7594e9..14ab5c3cae1 100644
--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
@@ -11,10 +11,10 @@
[metabase.driver.common.table-rows-sample :as table-rows-sample]
[metabase.driver.settings :as driver.settings]
[metabase.lib.core :as lib]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.pipeline :as qp.pipeline]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.bigquery-cloud-sdk :as bigquery.tx]
diff --git a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_impersonation_test.clj b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_impersonation_test.clj
index c3aa895c636..472f8078eb5 100644
--- a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_impersonation_test.clj
+++ b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_impersonation_test.clj
@@ -8,8 +8,8 @@
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
[metabase.driver.test-util :as driver.tu]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync.core]
[metabase.test :as mt]
[metabase.test.data.clickhouse :as ctd]
diff --git a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_introspection_test.clj b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_introspection_test.clj
index 88c93bff4ad..b315702648f 100644
--- a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_introspection_test.clj
+++ b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_introspection_test.clj
@@ -3,7 +3,7 @@
[clojure.test :refer :all]
[metabase.driver :as driver]
[metabase.driver.common :as driver.common]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.clickhouse]
diff --git a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_substitution_test.clj b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_substitution_test.clj
index e60c41620dd..63f5a3888e6 100644
--- a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_substitution_test.clj
+++ b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_substitution_test.clj
@@ -2,8 +2,8 @@
(:require
[clojure.test :refer :all]
[java-time.api :as t]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.clickhouse :as ctd]
[metabase.util :as u]
diff --git a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
index 953936eed26..4a447632766 100644
--- a/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
+++ b/modules/drivers/clickhouse/test/metabase/driver/clickhouse_test.clj
@@ -12,8 +12,8 @@
[metabase.lib.card :as lib.card]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.sync.sync :as sync]
[metabase.test :as mt]
[metabase.test.data.clickhouse :as ctd]
diff --git a/modules/drivers/databricks/test/metabase/driver/databricks_test.clj b/modules/drivers/databricks/test/metabase/driver/databricks_test.clj
index 13b0b6023c5..e89dc33da19 100644
--- a/modules/drivers/databricks/test/metabase/driver/databricks_test.clj
+++ b/modules/drivers/databricks/test/metabase/driver/databricks_test.clj
@@ -12,7 +12,7 @@
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj b/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
index 973007e9547..b053f490d19 100644
--- a/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
+++ b/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
@@ -12,8 +12,8 @@
[metabase.lib-be.metadata.jvm :as lib.metadata.jvm]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.sync.core :as sync]
[metabase.sync.sync-metadata.dbms-version :as sync-dbms-ver]
diff --git a/modules/drivers/druid/test/metabase/driver/druid/client_test.clj b/modules/drivers/druid/test/metabase/driver/druid/client_test.clj
index 91176bbd1ac..59d89314ff3 100644
--- a/modules/drivers/druid/test/metabase/driver/druid/client_test.clj
+++ b/modules/drivers/druid/test/metabase/driver/druid/client_test.clj
@@ -5,7 +5,7 @@
[metabase.driver.druid.client :as druid.client]
[metabase.driver.settings :as driver.settings]
[metabase.driver.util :as driver.u]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.test :as mt]))
diff --git a/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj b/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
index 199a1653148..3dbfeef0cc8 100644
--- a/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
+++ b/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
@@ -8,8 +8,8 @@
[metabase.driver :as driver]
[metabase.driver.common.table-rows-sample :as table-rows-sample]
[metabase.driver.druid.query-processor :as druid.qp]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.timeseries-test.util :as tqpt]
[metabase.test :as mt]
[metabase.util.date-2 :as u.date]
diff --git a/modules/drivers/mongo/test/metabase/driver/mongo/execute_test.clj b/modules/drivers/mongo/test/metabase/driver/mongo/execute_test.clj
index 2cbd13b6a7d..872ad368bb6 100644
--- a/modules/drivers/mongo/test/metabase/driver/mongo/execute_test.clj
+++ b/modules/drivers/mongo/test/metabase/driver/mongo/execute_test.clj
@@ -4,9 +4,9 @@
[clojure.test :refer :all]
[metabase.driver.mongo.conversion :as mongo.conversion]
[metabase.driver.mongo.execute :as mongo.execute]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.cache.impl :as middleware.cache.impl]
[metabase.query-processor.pipeline :as qp.pipeline]
+ [metabase.query-processor.test :as qp]
[metabase.server.streaming-response :as streaming-response]
[metabase.test :as mt])
(:import
diff --git a/modules/drivers/mongo/test/metabase/driver/mongo/parameters_test.clj b/modules/drivers/mongo/test/metabase/driver/mongo/parameters_test.clj
index 8b04a86afc4..a02def22c1e 100644
--- a/modules/drivers/mongo/test/metabase/driver/mongo/parameters_test.clj
+++ b/modules/drivers/mongo/test/metabase/driver/mongo/parameters_test.clj
@@ -6,7 +6,7 @@
[java-time.api :as t]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.driver.common.parameters :as params]
[metabase.driver.mongo.parameters :as mongo.params]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util.json :as json]))
diff --git a/modules/drivers/mongo/test/metabase/driver/mongo/query_processor_test.clj b/modules/drivers/mongo/test/metabase/driver/mongo/query_processor_test.clj
index a13e0fd771e..13c6e62d966 100644
--- a/modules/drivers/mongo/test/metabase/driver/mongo/query_processor_test.clj
+++ b/modules/drivers/mongo/test/metabase/driver/mongo/query_processor_test.clj
@@ -9,11 +9,11 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.alternative-date-test :as qp.alternative-date-test]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.date-time-zone-functions-test :as qp.datetime-test]
[metabase.query-processor.pivot :as qp.pivot]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.timezone :as qp.timezone]
[metabase.test :as mt]
[metabase.util.json :as json]))
diff --git a/modules/drivers/mongo/test/metabase/driver/mongo_test.clj b/modules/drivers/mongo/test/metabase/driver/mongo_test.clj
index 65456c87308..0b8392b6295 100644
--- a/modules/drivers/mongo/test/metabase/driver/mongo_test.clj
+++ b/modules/drivers/mongo/test/metabase/driver/mongo_test.clj
@@ -17,8 +17,8 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.util.match :as lib.util.match]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.sync.core :as sync]
[metabase.test :as mt]
diff --git a/modules/drivers/oracle/test/metabase/driver/oracle_test.clj b/modules/drivers/oracle/test/metabase/driver/oracle_test.clj
index 1020c7f8e61..673152cc743 100644
--- a/modules/drivers/oracle/test/metabase/driver/oracle_test.clj
+++ b/modules/drivers/oracle/test/metabase/driver/oracle_test.clj
@@ -18,11 +18,11 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
[metabase.premium-features.core :as premium-features]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.order-by-test :as qp-test.order-by-test]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.sync.util :as sync-util]
[metabase.test :as mt]
diff --git a/modules/drivers/presto-jdbc/test/metabase/driver/presto_jdbc_test.clj b/modules/drivers/presto-jdbc/test/metabase/driver/presto_jdbc_test.clj
index 6213ff06e5f..2b54135fd34 100644
--- a/modules/drivers/presto-jdbc/test/metabase/driver/presto_jdbc_test.clj
+++ b/modules/drivers/presto-jdbc/test/metabase/driver/presto_jdbc_test.clj
@@ -10,8 +10,8 @@
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
[metabase.driver.sql.query-processor :as sql.qp]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.presto-jdbc :as data.presto-jdbc]
diff --git a/modules/drivers/redshift/test/metabase/driver/redshift_test.clj b/modules/drivers/redshift/test/metabase/driver/redshift_test.clj
index 56cbb8ee9b7..c4380ee62a7 100644
--- a/modules/drivers/redshift/test/metabase/driver/redshift_test.clj
+++ b/modules/drivers/redshift/test/metabase/driver/redshift_test.clj
@@ -13,8 +13,8 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
[metabase.plugins.jdbc-proxy :as jdbc-proxy]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.sync.util :as sync-util]
[metabase.system.core :as system]
diff --git a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
index 8841e5fddd7..e854f24cfcc 100644
--- a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
+++ b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
@@ -25,8 +25,8 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace :discouraged-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.secrets.core :as secret]
[metabase.sync.core :as sync]
[metabase.sync.fetch-metadata :as fetch-metadata]
diff --git a/modules/drivers/sparksql/test/metabase/driver/sparksql_test.clj b/modules/drivers/sparksql/test/metabase/driver/sparksql_test.clj
index a30e8ccf849..1d3a54bf4ef 100644
--- a/modules/drivers/sparksql/test/metabase/driver/sparksql_test.clj
+++ b/modules/drivers/sparksql/test/metabase/driver/sparksql_test.clj
@@ -6,8 +6,8 @@
[metabase.driver.sparksql :as sparksql]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
[metabase.driver.sql.query-processor :as sql.qp]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(set! *warn-on-reflection* true)
diff --git a/modules/drivers/sqlite/test/metabase/driver/sqlite_test.clj b/modules/drivers/sqlite/test/metabase/driver/sqlite_test.clj
index 2687fd33ef0..1881a76ba0a 100644
--- a/modules/drivers/sqlite/test/metabase/driver/sqlite_test.clj
+++ b/modules/drivers/sqlite/test/metabase/driver/sqlite_test.clj
@@ -6,7 +6,7 @@
[metabase.driver :as driver]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.sql.query-processor-test-util :as sql.qp-test-util]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.util :as u]
diff --git a/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj b/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
index 4f575562ad0..20f82e7e145 100644
--- a/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
+++ b/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
@@ -16,11 +16,11 @@
[metabase.driver.sqlserver :as sqlserver]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.middleware.limit :as limit]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.query-processor.timezone :as qp.timezone]
[metabase.test :as mt]
diff --git a/modules/drivers/starburst/test/metabase/driver/starburst_test.clj b/modules/drivers/starburst/test/metabase/driver/starburst_test.clj
index 72d304ede27..3cb87fbf433 100644
--- a/modules/drivers/starburst/test/metabase/driver/starburst_test.clj
+++ b/modules/drivers/starburst/test/metabase/driver/starburst_test.clj
@@ -10,8 +10,8 @@
[metabase.driver.sql-jdbc.sync.interface :as sql-jdbc.sync.interface]
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.starburst :as starburst]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.timezones-test :as timezones-test]
[metabase.sync.core :as sync]
[metabase.test :as mt]
diff --git a/src/metabase/actions/execution.clj b/src/metabase/actions/execution.clj
index 6edda95a63f..cc786467fa7 100644
--- a/src/metabase/actions/execution.clj
+++ b/src/metabase/actions/execution.clj
@@ -16,11 +16,10 @@
[metabase.model-persistence.core :as model-persistence]
[metabase.parameters.schema :as parameters.schema]
[metabase.queries.models.query :as query]
- [metabase.query-processor :as qp]
[metabase.query-processor.card :as qp.card]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.error-type :as qp.error-type]
[metabase.query-processor.middleware.permissions :as qp.perms]
- [metabase.query-processor.writeback :as qp.writeback]
[metabase.util :as u]
[metabase.util.i18n :refer [tru]]
[metabase.util.log :as log]
@@ -45,7 +44,7 @@
(assoc :parameters parameters))]
(log/debugf "Query (before preprocessing):\n\n%s" (u/pprint-to-str query))
(binding [qp.perms/*card-id* model-id]
- (qp.writeback/execute-write-query! query)))
+ (qp/execute-write-query! query)))
(catch Throwable e
(if (= (:type (u/all-ex-data e)) qp.error-type/missing-required-permissions)
(api/throw-403 e)
diff --git a/src/metabase/driver/common/parameters/values.clj b/src/metabase/driver/common/parameters/values.clj
index e97a5442ee8..b4bc81871a8 100644
--- a/src/metabase/driver/common/parameters/values.clj
+++ b/src/metabase/driver/common/parameters/values.clj
@@ -30,8 +30,8 @@
[metabase.lib.schema.parameter :as lib.schema.parameter]
[metabase.lib.schema.template-tag :as lib.schema.template-tag]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.error-type :as qp.error-type]
- [metabase.query-processor.middleware.limit :as limit]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.query-processor.util.persisted-cache :as qp.persistence]
[metabase.util :as u]
@@ -246,7 +246,7 @@
{:query (qp.persistence/persisted-info-native-query
(u/the-id (lib.metadata/database (qp.store/metadata-provider)))
persisted-info)})
- (qp.compile/compile (limit/disable-max-results query))))))
+ (qp.compile/compile (qp/disable-max-results query))))))
(catch ExceptionInfo e
(throw (ex-info
(tru "The sub-query from referenced question #{0} failed with the following error: {1}"
diff --git a/src/metabase/driver/common/table_rows_sample.clj b/src/metabase/driver/common/table_rows_sample.clj
index b3f9353141c..9bc9127da80 100644
--- a/src/metabase/driver/common/table_rows_sample.clj
+++ b/src/metabase/driver/common/table_rows_sample.clj
@@ -8,7 +8,7 @@
[metabase.lib.schema :as lib.schema]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.lib.schema.metadata :as lib.schema.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.schema :as qp.schema]
[metabase.util.malli :as mu]
[metabase.util.malli.registry :as mr]
diff --git a/src/metabase/driver_api/core.clj b/src/metabase/driver_api/core.clj
index 505c76b1dad..b2ff61d353a 100644
--- a/src/metabase/driver_api/core.clj
+++ b/src/metabase/driver_api/core.clj
@@ -32,8 +32,8 @@
[metabase.logger.core :as logger]
[metabase.models.interface :as mi]
[metabase.premium-features.core :as premium-features]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.debug :as qp.debug]
[metabase.query-processor.error-type :as qp.error-type]
[metabase.query-processor.interface :as qp.i]
diff --git a/src/metabase/indexed_entities/models/model_index.clj b/src/metabase/indexed_entities/models/model_index.clj
index 077b3862696..239154b416a 100644
--- a/src/metabase/indexed_entities/models/model_index.clj
+++ b/src/metabase/indexed_entities/models/model_index.clj
@@ -8,7 +8,7 @@
[metabase.lib.schema.common :as lib.schema.common]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.models.interface :as mi]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.search.core :as search]
[metabase.sync.schedules :as sync.schedules]
[metabase.util.cron :as u.cron]
diff --git a/src/metabase/metrics/api.clj b/src/metabase/metrics/api.clj
index 1f4871b3dc5..7ba65f91f56 100644
--- a/src/metabase/metrics/api.clj
+++ b/src/metabase/metrics/api.clj
@@ -7,7 +7,7 @@
[metabase.lib-metric.core :as lib-metric]
[metabase.lib-metric.schema :as lib-metric.schema]
[metabase.metrics.core :as metrics]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.streaming :as qp.streaming]
[metabase.request.core :as request]
[metabase.server.core :as server]
diff --git a/src/metabase/model_persistence/task/persist_refresh.clj b/src/metabase/model_persistence/task/persist_refresh.clj
index 8345b5d9553..b4dfba39197 100644
--- a/src/metabase/model_persistence/task/persist_refresh.clj
+++ b/src/metabase/model_persistence/task/persist_refresh.clj
@@ -13,7 +13,7 @@
[metabase.events.core :as events]
[metabase.model-persistence.models.persisted-info :as persisted-info]
[metabase.model-persistence.settings :as model-persistence.settings]
- [metabase.query-processor.middleware.limit :as limit]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.timezone :as qp.timezone]
[metabase.task-history.core :as task-history]
[metabase.task.core :as task]
@@ -48,7 +48,7 @@
(reify Refresher
(refresh! [_ database definition card]
(binding [persisted-info/*allow-persisted-substitution* false]
- (let [query (limit/disable-max-results (:dataset_query card))]
+ (let [query (qp/disable-max-results (:dataset_query card))]
(ddl.i/refresh! (:engine database) database definition query))))
(unpersist! [_ database persisted-info]
(ddl.i/unpersist! (:engine database) database persisted-info))))
diff --git a/src/metabase/notification/payload/execute.clj b/src/metabase/notification/payload/execute.clj
index 78a8185f9cc..646b759676b 100644
--- a/src/metabase/notification/payload/execute.clj
+++ b/src/metabase/notification/payload/execute.clj
@@ -10,8 +10,8 @@
[metabase.models.visualization-settings :as viz-settings]
[metabase.notification.payload.temp-storage :as notification.temp-storage]
[metabase.parameters.shared :as shared.params]
- [metabase.query-processor :as qp]
[metabase.query-processor.card :as qp.card]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.dashboard :as qp.dashboard]
[metabase.request.core :as request]
[metabase.system.core :as system]
diff --git a/src/metabase/query_processor/core.clj b/src/metabase/query_processor/core.clj
new file mode 100644
index 00000000000..6e9e4e6bccb
--- /dev/null
+++ b/src/metabase/query_processor/core.clj
@@ -0,0 +1,81 @@
+(ns metabase.query-processor.core
+ "Convenience facade over the query-processor module. Re-exports the most-used public vars from
+ sub-namespaces so callers that need several QP functions only need a single require:
+
+ (:require [metabase.query-processor.core :as qp])
+
+ Sub-namespaces remain valid imports for callers that need only a narrow slice."
+ (:refer-clojure :exclude [compile])
+ (:require
+ [metabase.query-processor :as qp]
+ [metabase.query-processor.card :as qp.card]
+ [metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.dashboard :as qp.dashboard]
+ [metabase.query-processor.metadata :as qp.metadata]
+ [metabase.query-processor.middleware.constraints :as qp.constraints]
+ [metabase.query-processor.middleware.limit :as qp.limit]
+ [metabase.query-processor.pivot :as qp.pivot]
+ [metabase.query-processor.preprocess :as qp.preprocess]
+ [metabase.query-processor.streaming :as qp.streaming]
+ [metabase.query-processor.timezone :as qp.timezone]
+ [metabase.query-processor.util :as qp.util]
+ [metabase.query-processor.writeback :as qp.writeback]
+ [metabase.util.namespaces :as shared.ns]))
+
+(shared.ns/import-fns
+ ;; Core entrypoints — metabase.query-processor
+ [qp
+ process-query
+ userland-query
+ userland-query-with-default-constraints]
+ ;; Card — metabase.query-processor.card
+ [qp.card
+ combined-parameters-and-template-tags
+ process-query-for-card
+ process-query-for-card-default-qp
+ query-for-card]
+ ;; Compile — metabase.query-processor.compile
+ [qp.compile
+ compile
+ compile-with-inline-parameters]
+ ;; Dashboard — metabase.query-processor.dashboard
+ [qp.dashboard
+ process-query-for-dashcard]
+ ;; Metadata — metabase.query-processor.metadata
+ [qp.metadata
+ result-metadata]
+ ;; Constraints — metabase.query-processor.middleware.constraints
+ [qp.constraints
+ default-query-constraints]
+ ;; Limit — metabase.query-processor.middleware.limit
+ [qp.limit
+ disable-max-results]
+
+ ;; Pivot — metabase.query-processor.pivot
+ [qp.pivot
+ run-pivot-query]
+ ;; Preprocessing — metabase.query-processor.preprocess
+ [qp.preprocess
+ preprocess
+ query->expected-cols]
+ ;; Streaming — metabase.query-processor.streaming
+ [qp.streaming
+ order-cols
+ streaming-response]
+ ;; Timezone — metabase.query-processor.timezone
+ [qp.timezone
+ database-timezone-id
+ report-timezone-id-if-supported
+ requested-timezone-id
+ results-timezone-id
+ system-timezone-id]
+ ;; Util — metabase.query-processor.util
+ [qp.util
+ default-query->remark
+ internal-query?
+ query->remark
+ query-hash
+ userland-query?]
+ ;; Writeback — metabase.query-processor.writeback
+ [qp.writeback
+ execute-write-query!])
diff --git a/src/metabase/tiles/api.clj b/src/metabase/tiles/api.clj
index 19589f87ba1..8d96ae09c4c 100644
--- a/src/metabase/tiles/api.clj
+++ b/src/metabase/tiles/api.clj
@@ -12,8 +12,8 @@
[metabase.lib.schema.id :as lib.schema.id]
[metabase.lib.schema.metadata :as lib.schema.metadata]
[metabase.parameters.schema :as parameters.schema]
- [metabase.query-processor :as qp]
[metabase.query-processor.card :as qp.card]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.dashboard :as qp.dashboard]
[metabase.util :as u]
[metabase.util.i18n :refer [tru]]
diff --git a/src/metabase/transforms_base/util.clj b/src/metabase/transforms_base/util.clj
index 2c8c4f29081..9dd52394684 100644
--- a/src/metabase/transforms_base/util.clj
+++ b/src/metabase/transforms_base/util.clj
@@ -13,8 +13,8 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.schema.common :as lib.schema.common]
[metabase.lib.util :as lib.util]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.middleware.add-remaps :as remap]
[metabase.query-processor.middleware.catch-exceptions :as qp.catch-exceptions]
[metabase.query-processor.parameters.dates :as params.dates]
diff --git a/src/metabase/warehouse_schema_rest/api/table.clj b/src/metabase/warehouse_schema_rest/api/table.clj
index 68e5943e26e..689a077979a 100644
--- a/src/metabase/warehouse_schema_rest/api/table.clj
+++ b/src/metabase/warehouse_schema_rest/api/table.clj
@@ -16,7 +16,7 @@
[metabase.models.interface :as mi]
[metabase.permissions.core :as perms]
[metabase.premium-features.core :as premium-features]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
;; legacy usage -- don't do things like this going forward
^{:clj-kondo/ignore [:deprecated-namespace :discouraged-namespace]}
[metabase.query-processor.store :as qp.store]
diff --git a/test/metabase/actions/actions_test.clj b/test/metabase/actions/actions_test.clj
index 55562dcd2b0..421b0028b43 100644
--- a/test/metabase/actions/actions_test.clj
+++ b/test/metabase/actions/actions_test.clj
@@ -12,7 +12,7 @@
[metabase.driver.connection :as driver.conn]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.test-util :as driver.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/analyze/query_results_test.clj b/test/metabase/analyze/query_results_test.clj
index 63f1e6332ff..c2ee79e9389 100644
--- a/test/metabase/analyze/query_results_test.clj
+++ b/test/metabase/analyze/query_results_test.clj
@@ -6,8 +6,8 @@
[metabase.analyze.query-results :as qr]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.sync :as test.sync]
diff --git a/test/metabase/app_db/query_test.clj b/test/metabase/app_db/query_test.clj
index 30ec81f800e..ebc933bd1ed 100644
--- a/test/metabase/app_db/query_test.clj
+++ b/test/metabase/app_db/query_test.clj
@@ -5,8 +5,8 @@
[clojure.test :refer :all]
[metabase.app-db.format :as app-db.format]
[metabase.app-db.query :as mdb.query]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[toucan2.core :as t2])
diff --git a/test/metabase/channel/render/body_test.clj b/test/metabase/channel/render/body_test.clj
index 6bd26727ec9..48d10978b87 100644
--- a/test/metabase/channel/render/body_test.clj
+++ b/test/metabase/channel/render/body_test.clj
@@ -12,7 +12,7 @@
[metabase.formatter.core :as formatter]
[metabase.notification.payload.execute :as notification.execute]
[metabase.pulse.render.test-util :as render.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
[metabase.util :as u]))
diff --git a/test/metabase/channel/render/card_test.clj b/test/metabase/channel/render/card_test.clj
index 4448fb5ac87..9aea1ddac6c 100644
--- a/test/metabase/channel/render/card_test.clj
+++ b/test/metabase/channel/render/card_test.clj
@@ -8,7 +8,7 @@
[metabase.channel.render.core :as channel.render]
[metabase.lib.util.match :as lib.util.match]
[metabase.pulse.render.test-util :as render.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/test/metabase/dashboards_rest/api_test.clj b/test/metabase/dashboards_rest/api_test.clj
index a18f83abb9d..99dcbee44d2 100644
--- a/test/metabase/dashboards_rest/api_test.clj
+++ b/test/metabase/dashboards_rest/api_test.clj
@@ -34,10 +34,10 @@
[metabase.pulse.dashboard-subscription-test :as dashboard-subscription-test]
[metabase.pulse.models.pulse :as models.pulse]
[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]
[metabase.query-processor.streaming.test-util :as streaming.test-util]
+ [metabase.query-processor.test :as qp]
[metabase.revisions.models.revision :as revision]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
diff --git a/test/metabase/driver/common/parameters/values_test.clj b/test/metabase/driver/common/parameters/values_test.clj
index 786093de4ee..0a47c13d6c6 100644
--- a/test/metabase/driver/common/parameters/values_test.clj
+++ b/test/metabase/driver/common/parameters/values_test.clj
@@ -15,9 +15,9 @@
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.permissions :as qp.perms]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.system.core :as system]
[metabase.test :as mt]
[metabase.util :as u]
diff --git a/test/metabase/driver/h2_test.clj b/test/metabase/driver/h2_test.clj
index 4aeb2cb005b..7c2fb606fbc 100644
--- a/test/metabase/driver/h2_test.clj
+++ b/test/metabase/driver/h2_test.clj
@@ -17,9 +17,9 @@
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.preprocess :as qp.preprocess]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util.honey-sql-2 :as h2x]
[toucan2.core :as t2]))
diff --git a/test/metabase/driver/mysql_test.clj b/test/metabase/driver/mysql_test.clj
index efb94f70c69..5fefd33b72e 100644
--- a/test/metabase/driver/mysql_test.clj
+++ b/test/metabase/driver/mysql_test.clj
@@ -26,10 +26,10 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.query-processor.string-extracts-test :as string-extracts-test]
+ [metabase.query-processor.test :as qp]
[metabase.sync.analyze.fingerprint :as sync.fingerprint]
[metabase.sync.core :as sync]
[metabase.sync.sync-metadata.tables :as sync-tables]
diff --git a/test/metabase/driver/postgres_test.clj b/test/metabase/driver/postgres_test.clj
index 3e972f6ad0a..8e18686cd83 100644
--- a/test/metabase/driver/postgres_test.clj
+++ b/test/metabase/driver/postgres_test.clj
@@ -33,13 +33,13 @@
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.metadata-providers.mock :as providers.mock]
[metabase.notification.payload.temp-storage :as temp-storage]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.error-type :as qp.error-type]
[metabase.query-processor.middleware.catch-exceptions :as catch-exceptions]
[metabase.query-processor.pipeline :as qp.pipeline]
[metabase.query-processor.reducible :as qp.reducible]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.secrets.models.secret :as secret]
[metabase.sync.core :as sync]
[metabase.sync.sync-metadata :as sync-metadata]
diff --git a/test/metabase/driver/sql/parameters/substitute_test.clj b/test/metabase/driver/sql/parameters/substitute_test.clj
index a9ad8854baa..65046e9f6dd 100644
--- a/test/metabase/driver/sql/parameters/substitute_test.clj
+++ b/test/metabase/driver/sql/parameters/substitute_test.clj
@@ -10,9 +10,9 @@
[metabase.legacy-mbql.normalize :as mbql.normalize]
[metabase.lib.core :as lib]
[metabase.lib.test-metadata :as meta]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.middleware.parameters.native :as qp.native]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/driver/sql/query_processor_test.clj b/test/metabase/driver/sql/query_processor_test.clj
index e9d761c6fc3..0e2ef9bd71d 100644
--- a/test/metabase/driver/sql/query_processor_test.clj
+++ b/test/metabase/driver/sql/query_processor_test.clj
@@ -17,11 +17,11 @@
[metabase.lib.test-util.macros :as lib.tu.macros]
[metabase.lib.test-util.notebook-helpers :as lib.tu.notebook]
[metabase.lib.test-util.places-cam-likes-metadata-provider :as lib.tu.places-cam-likes-metadata-provider]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.middleware.limit :as limit]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util.add-alias-info :as add]
[metabase.settings.core :as setting]
[metabase.test :as mt]
diff --git a/test/metabase/driver/sql_jdbc/connection_test.clj b/test/metabase/driver/sql_jdbc/connection_test.clj
index 50e2a01b0a6..f675b159d59 100644
--- a/test/metabase/driver/sql_jdbc/connection_test.clj
+++ b/test/metabase/driver/sql_jdbc/connection_test.clj
@@ -21,7 +21,7 @@
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
[metabase.driver.util :as driver.u]
[metabase.premium-features.core :as premium-features]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.sync.core :as sync]
[metabase.test :as mt]
diff --git a/test/metabase/driver/sql_jdbc/native_test.clj b/test/metabase/driver/sql_jdbc/native_test.clj
index d06bc885904..947717b810c 100644
--- a/test/metabase/driver/sql_jdbc/native_test.clj
+++ b/test/metabase/driver/sql_jdbc/native_test.clj
@@ -3,7 +3,7 @@
(:require
[clojure.test :refer :all]
[medley.core :as m]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util.malli.schema :as ms]))
diff --git a/test/metabase/driver/sql_jdbc/sync/describe_database_test.clj b/test/metabase/driver/sql_jdbc/sync/describe_database_test.clj
index d96fbab1945..50f0a780b93 100644
--- a/test/metabase/driver/sql_jdbc/sync/describe_database_test.clj
+++ b/test/metabase/driver/sql_jdbc/sync/describe_database_test.clj
@@ -12,8 +12,8 @@
[metabase.driver.sql-jdbc.sync.describe-database :as sql-jdbc.describe-database]
[metabase.driver.sql-jdbc.sync.interface :as sql-jdbc.sync.interface]
[metabase.driver.util :as driver.u]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/driver/sql_jdbc_test.clj b/test/metabase/driver/sql_jdbc_test.clj
index b759d040712..93852bdc357 100644
--- a/test/metabase/driver/sql_jdbc_test.clj
+++ b/test/metabase/driver/sql_jdbc_test.clj
@@ -10,8 +10,8 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.dataset-definition-test :as dataset-definition-test]
[metabase.test.data.sql :as sql.tx]
diff --git a/test/metabase/driver_test.clj b/test/metabase/driver_test.clj
index 512cba9e393..091f3fd0525 100644
--- a/test/metabase/driver_test.clj
+++ b/test/metabase/driver_test.clj
@@ -9,8 +9,8 @@
[metabase.driver.impl :as driver.impl]
[metabase.driver.settings :as driver.settings]
[metabase.driver.util :as driver.u]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.sync.task.sync-databases :as task.sync-databases]
[metabase.test :as mt]
[metabase.test.data.env :as tx.env]
diff --git a/test/metabase/indexed_entities/models/model_index_test.clj b/test/metabase/indexed_entities/models/model_index_test.clj
index 4cde76eee41..b7612002824 100644
--- a/test/metabase/indexed_entities/models/model_index_test.clj
+++ b/test/metabase/indexed_entities/models/model_index_test.clj
@@ -7,8 +7,8 @@
[metabase.driver.util :as driver.u]
[metabase.indexed-entities.models.model-index :as model-index]
[metabase.indexed-entities.task.index-values :as task.index-values]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.sync.task.sync-databases :as task.sync-databases]
[metabase.task.impl :as task]
[metabase.test :as mt]
diff --git a/test/metabase/measures/api_test.clj b/test/metabase/measures/api_test.clj
index c92ecc64dc9..48c9afa45b6 100644
--- a/test/metabase/measures/api_test.clj
+++ b/test/metabase/measures/api_test.clj
@@ -6,7 +6,7 @@
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.http-client :as client]
[metabase.util :as u]
diff --git a/test/metabase/pulse/api/pulse_test.clj b/test/metabase/pulse/api/pulse_test.clj
index 531262cd49e..031daad10b0 100644
--- a/test/metabase/pulse/api/pulse_test.clj
+++ b/test/metabase/pulse/api/pulse_test.clj
@@ -16,7 +16,7 @@
[metabase.pulse.models.pulse-test :as pulse-test]
[metabase.pulse.test-util :as pulse.test-util]
[metabase.queries-rest.api.card-test :as api.card-test]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
[metabase.test.http-client :as client]
diff --git a/test/metabase/pulse/render/test_util.clj b/test/metabase/pulse/render/test_util.clj
index b8ef638735d..d86e5807cd3 100644
--- a/test/metabase/pulse/render/test_util.clj
+++ b/test/metabase/pulse/render/test_util.clj
@@ -14,9 +14,9 @@
[metabase.channel.render.js.svg :as js.svg]
[metabase.channel.shared :as channel.shared]
[metabase.notification.payload.execute :as notification.execute]
- [metabase.query-processor :as qp]
[metabase.query-processor.card :as qp.card]
[metabase.query-processor.pivot :as qp.pivot]
+ [metabase.query-processor.test :as qp]
[toucan2.core :as t2])
(:import
(org.apache.batik.anim.dom SVGOMDocument AbstractElement$ExtendedNamedNodeHashMap)
diff --git a/test/metabase/query_processor/aggregation_test.clj b/test/metabase/query_processor/aggregation_test.clj
index 7aae4b2bc25..9d726341f59 100644
--- a/test/metabase/query_processor/aggregation_test.clj
+++ b/test/metabase/query_processor/aggregation_test.clj
@@ -8,9 +8,9 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/test/metabase/query_processor/alternative_date_test.clj b/test/metabase/query_processor/alternative_date_test.clj
index b054e54498b..ba0fa8dfd0a 100644
--- a/test/metabase/query_processor/alternative_date_test.clj
+++ b/test/metabase/query_processor/alternative_date_test.clj
@@ -8,7 +8,7 @@
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.lib.core :as lib]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/query_processor/api_test.clj b/test/metabase/query_processor/api_test.clj
index c690bdfac22..b1d927d4d3d 100644
--- a/test/metabase/query_processor/api_test.clj
+++ b/test/metabase/query_processor/api_test.clj
@@ -21,12 +21,12 @@
[metabase.lib.test-util :as lib.tu]
[metabase.lib.util.unique-name-generator]
[metabase.permissions.core :as perms]
- [metabase.query-processor :as qp]
[metabase.query-processor.api :as api.dataset]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.middleware.constraints :as qp.constraints]
[metabase.query-processor.pivot.test-util :as qp.pivot.test-util]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.query-processor.util :as qp.util]
[metabase.test :as mt]
diff --git a/test/metabase/query_processor/binning_test.clj b/test/metabase/query_processor/binning_test.clj
index 308467a5935..30d20f3b351 100644
--- a/test/metabase/query_processor/binning_test.clj
+++ b/test/metabase/query_processor/binning_test.clj
@@ -5,7 +5,7 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel binning-in-result-cols-display-name-test
diff --git a/test/metabase/query_processor/breakout_test.clj b/test/metabase/query_processor/breakout_test.clj
index c9a2527d3e0..5055b9cc917 100644
--- a/test/metabase/query_processor/breakout_test.clj
+++ b/test/metabase/query_processor/breakout_test.clj
@@ -7,9 +7,9 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.add-remaps :as qp.add-remaps]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.dataset-definitions :as defs]
diff --git a/test/metabase/query_processor/card_test.clj b/test/metabase/query_processor/card_test.clj
index ba9161ca8ee..ac08468e16b 100644
--- a/test/metabase/query_processor/card_test.clj
+++ b/test/metabase/query_processor/card_test.clj
@@ -14,10 +14,10 @@
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.card :as qp.card]
[metabase.query-processor.middleware.results-metadata :as qp.results-metadata]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.users :as test.users]
diff --git a/test/metabase/query_processor/case_test.clj b/test/metabase/query_processor/case_test.clj
index ded62a27924..d93746d852e 100644
--- a/test/metabase/query_processor/case_test.clj
+++ b/test/metabase/query_processor/case_test.clj
@@ -3,7 +3,7 @@
[clojure.test :refer :all]
[metabase.lib.core :as lib]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(defn- test-case
diff --git a/test/metabase/query_processor/cast_test.clj b/test/metabase/query_processor/cast_test.clj
index eb3b4f02349..522a276f614 100644
--- a/test/metabase/query_processor/cast_test.clj
+++ b/test/metabase/query_processor/cast_test.clj
@@ -16,9 +16,9 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.alternative-date-test :as adt]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/query_processor/coercion_test.clj b/test/metabase/query_processor/coercion_test.clj
index edaa323ef27..1efef3d27eb 100644
--- a/test/metabase/query_processor/coercion_test.clj
+++ b/test/metabase/query_processor/coercion_test.clj
@@ -5,8 +5,8 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.notebook-helpers :as lib.tu.notebook]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.types.core :as types]
diff --git a/test/metabase/query_processor/constraints_test.clj b/test/metabase/query_processor/constraints_test.clj
index 2ded517d4d2..a985b513733 100644
--- a/test/metabase/query_processor/constraints_test.clj
+++ b/test/metabase/query_processor/constraints_test.clj
@@ -2,8 +2,8 @@
"Test for MBQL `:constraints`"
(:require
[clojure.test :refer :all]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(defn- mbql-query []
diff --git a/test/metabase/query_processor/count_where_test.clj b/test/metabase/query_processor/count_where_test.clj
index e503aae3c87..07faf055658 100644
--- a/test/metabase/query_processor/count_where_test.clj
+++ b/test/metabase/query_processor/count_where_test.clj
@@ -4,8 +4,8 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel basic-test
diff --git a/test/metabase/query_processor/cumulative_aggregation_test.clj b/test/metabase/query_processor/cumulative_aggregation_test.clj
index 529be2a9221..2a83f23639c 100644
--- a/test/metabase/query_processor/cumulative_aggregation_test.clj
+++ b/test/metabase/query_processor/cumulative_aggregation_test.clj
@@ -5,7 +5,7 @@
[medley.core :as m]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(defn- ->local-date [t]
diff --git a/test/metabase/query_processor/dashboard_test.clj b/test/metabase/query_processor/dashboard_test.clj
index 66d8d58313c..8e3512ab19d 100644
--- a/test/metabase/query_processor/dashboard_test.clj
+++ b/test/metabase/query_processor/dashboard_test.clj
@@ -8,9 +8,9 @@
[metabase.driver.common :as driver.common]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
[metabase.query-processor.card-test :as qp.card-test]
[metabase.query-processor.dashboard :as qp.dashboard]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[toucan2.core :as t2]))
diff --git a/test/metabase/query_processor/date_bucketing_test.clj b/test/metabase/query_processor/date_bucketing_test.clj
index feaf378a50d..e28c9b502ca 100644
--- a/test/metabase/query_processor/date_bucketing_test.clj
+++ b/test/metabase/query_processor/date_bucketing_test.clj
@@ -27,11 +27,11 @@
[metabase.lib.convert :as lib.convert]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.middleware.format-rows :as format-rows]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/query_processor/date_time_zone_functions_test.clj b/test/metabase/query_processor/date_time_zone_functions_test.clj
index 59b150bf897..9638627ffd9 100644
--- a/test/metabase/query_processor/date_time_zone_functions_test.clj
+++ b/test/metabase/query_processor/date_time_zone_functions_test.clj
@@ -11,10 +11,10 @@
[metabase.lib.metadata.result-metadata :as lib.metadata.result-metadata]
[metabase.lib.options :as lib.options]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.annotate :as annotate]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.timezone :as qp.timezone]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/query_processor/drill_thru_e2e_test.clj b/test/metabase/query_processor/drill_thru_e2e_test.clj
index e88f7a559a0..1c034c5ce0b 100644
--- a/test/metabase/query_processor/drill_thru_e2e_test.clj
+++ b/test/metabase/query_processor/drill_thru_e2e_test.clj
@@ -6,8 +6,8 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.ref :as lib.ref]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel quick-filter-on-bucketed-date-test
diff --git a/test/metabase/query_processor/execute_test.clj b/test/metabase/query_processor/execute_test.clj
index a7a9d533715..64692620ad9 100644
--- a/test/metabase/query_processor/execute_test.clj
+++ b/test/metabase/query_processor/execute_test.clj
@@ -1,7 +1,7 @@
(ns metabase.query-processor.execute-test
(:require
[clojure.test :refer :all]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel native-form-test
diff --git a/test/metabase/query_processor/explicit_joins_test.clj b/test/metabase/query_processor/explicit_joins_test.clj
index 7ec8ce12ca6..452ad785165 100644
--- a/test/metabase/query_processor/explicit_joins_test.clj
+++ b/test/metabase/query_processor/explicit_joins_test.clj
@@ -13,10 +13,10 @@
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.mocks-31769 :as lib.tu.mocks-31769]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.query-processor.timezones-test :as timezones-test]
[metabase.test :as mt]
diff --git a/test/metabase/query_processor/expression_aggregations_test.clj b/test/metabase/query_processor/expression_aggregations_test.clj
index 2cfe086008c..48d2abdbeee 100644
--- a/test/metabase/query_processor/expression_aggregations_test.clj
+++ b/test/metabase/query_processor/expression_aggregations_test.clj
@@ -5,7 +5,7 @@
[metabase.driver :as driver]
[metabase.lib.core :as lib]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]))
diff --git a/test/metabase/query_processor/expressions_test.clj b/test/metabase/query_processor/expressions_test.clj
index fae8c80abc1..b3725f8a56e 100644
--- a/test/metabase/query_processor/expressions_test.clj
+++ b/test/metabase/query_processor/expressions_test.clj
@@ -5,7 +5,7 @@
[java-time.api :as t]
[medley.core :as m]
[metabase.driver :as driver]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
diff --git a/test/metabase/query_processor/failure_test.clj b/test/metabase/query_processor/failure_test.clj
index f0d977ffe58..8ec8f872185 100644
--- a/test/metabase/query_processor/failure_test.clj
+++ b/test/metabase/query_processor/failure_test.clj
@@ -2,8 +2,8 @@
"Tests for how the query processor as a whole handles failures."
(:require
[clojure.test :refer :all]
- [metabase.query-processor :as qp]
[metabase.query-processor.settings :as qp.settings]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util.malli.schema :as ms]))
diff --git a/test/metabase/query_processor/field_ref_repro_test.clj b/test/metabase/query_processor/field_ref_repro_test.clj
index c08bc092412..1a9fbc7fc96 100644
--- a/test/metabase/query_processor/field_ref_repro_test.clj
+++ b/test/metabase/query_processor/field_ref_repro_test.clj
@@ -8,9 +8,9 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]))
diff --git a/test/metabase/query_processor/filter_test.clj b/test/metabase/query_processor/filter_test.clj
index bf60a79f3b2..efdb1a445db 100644
--- a/test/metabase/query_processor/filter_test.clj
+++ b/test/metabase/query_processor/filter_test.clj
@@ -8,10 +8,10 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.options :as lib.options]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.query-processor.timezones-test :as timezones-test]
[metabase.test :as mt]
diff --git a/test/metabase/query_processor/generative_test.clj b/test/metabase/query_processor/generative_test.clj
index 263c851e469..0bec3db426d 100644
--- a/test/metabase/query_processor/generative_test.clj
+++ b/test/metabase/query_processor/generative_test.clj
@@ -7,7 +7,7 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.generators :as lib.tu.gen]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.gentest :as gt]
[metabase.test.util.generators.jvm :as tu.gen.jvm]
diff --git a/test/metabase/query_processor/implicit_joins_test.clj b/test/metabase/query_processor/implicit_joins_test.clj
index 7f701da9300..f23c9493786 100644
--- a/test/metabase/query_processor/implicit_joins_test.clj
+++ b/test/metabase/query_processor/implicit_joins_test.clj
@@ -9,8 +9,8 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
diff --git a/test/metabase/query_processor/inactive_fields_test.clj b/test/metabase/query_processor/inactive_fields_test.clj
index 668551a4333..e92e0384f33 100644
--- a/test/metabase/query_processor/inactive_fields_test.clj
+++ b/test/metabase/query_processor/inactive_fields_test.clj
@@ -6,8 +6,8 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.metadata.result-metadata :as lib.metadata.result-metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.preprocess :as qp.preprocess]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel inactive-remaps-in-join-test
diff --git a/test/metabase/query_processor/middleware/add_implicit_clauses_test.clj b/test/metabase/query_processor/middleware/add_implicit_clauses_test.clj
index f45a76e3f5b..cd912d8969d 100644
--- a/test/metabase/query_processor/middleware/add_implicit_clauses_test.clj
+++ b/test/metabase/query_processor/middleware/add_implicit_clauses_test.clj
@@ -10,9 +10,9 @@
[metabase.lib.test-util.macros :as lib.tu.macros]
[metabase.lib.test-util.notebook-helpers :as lib.tu.notebook]
[metabase.lib.types.isa :as lib.types.isa]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.add-implicit-clauses :as qp.add-implicit-clauses]
[metabase.query-processor.preprocess :as qp.preprocess]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(defn- add-implicit-clauses
diff --git a/test/metabase/query_processor/middleware/add_implicit_joins_test.clj b/test/metabase/query_processor/middleware/add_implicit_joins_test.clj
index 7cfbb808215..93d1cc56ad6 100644
--- a/test/metabase/query_processor/middleware/add_implicit_joins_test.clj
+++ b/test/metabase/query_processor/middleware/add_implicit_joins_test.clj
@@ -10,12 +10,12 @@
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
[metabase.lib.test-util.metadata-providers.remap :as lib.tu.remap]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.add-implicit-clauses :as qp.add-implicit-clauses]
[metabase.query-processor.middleware.add-implicit-joins :as qp.add-implicit-joins]
[metabase.query-processor.middleware.fetch-source-query]
[metabase.query-processor.preprocess :as qp.preprocess]
[metabase.query-processor.schema :as qp.schema]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.malli :as mu]))
diff --git a/test/metabase/query_processor/middleware/add_remaps_test.clj b/test/metabase/query_processor/middleware/add_remaps_test.clj
index 60ff3988cc7..c072e6e6d52 100644
--- a/test/metabase/query_processor/middleware/add_remaps_test.clj
+++ b/test/metabase/query_processor/middleware/add_remaps_test.clj
@@ -7,11 +7,11 @@
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.add-remaps :as qp.add-remaps]
[metabase.query-processor.preprocess :as qp.preprocess]
[metabase.query-processor.reducible :as qp.reducible]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]))
diff --git a/test/metabase/query_processor/middleware/add_rows_truncated_test.clj b/test/metabase/query_processor/middleware/add_rows_truncated_test.clj
index 3d961da55e9..700dff4a96d 100644
--- a/test/metabase/query_processor/middleware/add_rows_truncated_test.clj
+++ b/test/metabase/query_processor/middleware/add_rows_truncated_test.clj
@@ -2,9 +2,9 @@
(:require
[clojure.test :refer :all]
[metabase.lib.test-metadata :as meta]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.add-rows-truncated :as add-rows-truncated]
[metabase.query-processor.reducible :as qp.reducible]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(defn- add-rows-truncated [query rows]
diff --git a/test/metabase/query_processor/middleware/binning_test.clj b/test/metabase/query_processor/middleware/binning_test.clj
index b26bae7d3ca..6fefc1c0d4e 100644
--- a/test/metabase/query_processor/middleware/binning_test.clj
+++ b/test/metabase/query_processor/middleware/binning_test.clj
@@ -13,10 +13,10 @@
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.binning :as binning]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel filter->field-map-test
diff --git a/test/metabase/query_processor/middleware/cache_test.clj b/test/metabase/query_processor/middleware/cache_test.clj
index 977744a2602..d360d4ff2e3 100644
--- a/test/metabase/query_processor/middleware/cache_test.clj
+++ b/test/metabase/query_processor/middleware/cache_test.clj
@@ -16,7 +16,6 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
[metabase.queries.models.query :as query]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.cache :as cache]
[metabase.query-processor.middleware.cache-backend.interface :as i]
[metabase.query-processor.middleware.cache.impl :as impl]
@@ -25,6 +24,7 @@
[metabase.query-processor.reducible :as qp.reducible]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.query-processor.streaming :as qp.streaming]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.query-processor.util :as qp.util]
[metabase.request.core :as request]
diff --git a/test/metabase/query_processor/middleware/catch_exceptions_test.clj b/test/metabase/query_processor/middleware/catch_exceptions_test.clj
index b67e6db49aa..5ede3a51a0f 100644
--- a/test/metabase/query_processor/middleware/catch_exceptions_test.clj
+++ b/test/metabase/query_processor/middleware/catch_exceptions_test.clj
@@ -5,7 +5,6 @@
[metabase.driver :as driver]
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.error-type :as qp.error-type]
[metabase.query-processor.middleware.catch-exceptions
@@ -13,6 +12,7 @@
[metabase.query-processor.pipeline :as qp.pipeline]
[metabase.query-processor.preprocess :as qp.preprocess]
[metabase.query-processor.reducible :as qp.reducible]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.users :as test.users])
(:import
diff --git a/test/metabase/query_processor/middleware/expand_aggregations_test.clj b/test/metabase/query_processor/middleware/expand_aggregations_test.clj
index 5f3784f9b03..31ac411d2e4 100644
--- a/test/metabase/query_processor/middleware/expand_aggregations_test.clj
+++ b/test/metabase/query_processor/middleware/expand_aggregations_test.clj
@@ -6,7 +6,7 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.options :as lib.options]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt])
(:import
(clojure.lang ExceptionInfo)))
diff --git a/test/metabase/query_processor/middleware/fetch_source_query_test.clj b/test/metabase/query_processor/middleware/fetch_source_query_test.clj
index 4e9d1ffdff4..0a504731e85 100644
--- a/test/metabase/query_processor/middleware/fetch_source_query_test.clj
+++ b/test/metabase/query_processor/middleware/fetch_source_query_test.clj
@@ -11,10 +11,10 @@
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.fetch-source-query :as fetch-source-query]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]))
diff --git a/test/metabase/query_processor/middleware/fix_bad_field_id_refs_test.clj b/test/metabase/query_processor/middleware/fix_bad_field_id_refs_test.clj
index 1fbc1815000..e8e4d2b4a60 100644
--- a/test/metabase/query_processor/middleware/fix_bad_field_id_refs_test.clj
+++ b/test/metabase/query_processor/middleware/fix_bad_field_id_refs_test.clj
@@ -6,8 +6,8 @@
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.fix-bad-field-id-refs :as fix-bad-field-id-refs]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/test/metabase/query_processor/middleware/metrics_test.clj b/test/metabase/query_processor/middleware/metrics_test.clj
index 2eef712e92c..6520e7e5f0a 100644
--- a/test/metabase/query_processor/middleware/metrics_test.clj
+++ b/test/metabase/query_processor/middleware/metrics_test.clj
@@ -16,9 +16,9 @@
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
[metabase.lib.util :as lib.util]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.fetch-source-query :as fetch-source-query]
[metabase.query-processor.middleware.metrics :as metrics]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]))
diff --git a/test/metabase/query_processor/middleware/parameters/mbql_test.clj b/test/metabase/query_processor/middleware/parameters/mbql_test.clj
index 90e709f0422..b8438c9f03b 100644
--- a/test/metabase/query_processor/middleware/parameters/mbql_test.clj
+++ b/test/metabase/query_processor/middleware/parameters/mbql_test.clj
@@ -9,9 +9,9 @@
[metabase.lib.core :as lib]
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util.macros :as lib.tu.macros]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.middleware.parameters.mbql :as qp.mbql]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]))
diff --git a/test/metabase/query_processor/middleware/permissions_test.clj b/test/metabase/query_processor/middleware/permissions_test.clj
index 7a251f00212..f55f64c1dac 100644
--- a/test/metabase/query_processor/middleware/permissions_test.clj
+++ b/test/metabase/query_processor/middleware/permissions_test.clj
@@ -7,11 +7,11 @@
[metabase.lib-be.core :as lib-be]
[metabase.lib.test-metadata :as meta]
[metabase.permissions.core :as perms]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.permissions :as qp.perms]
[metabase.query-processor.pipeline :as qp.pipeline]
[metabase.query-processor.setup :as qp.setup]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.malli.fn :as mu.fn])
diff --git a/test/metabase/query_processor/middleware/process_userland_query_test.clj b/test/metabase/query_processor/middleware/process_userland_query_test.clj
index 2e58b6c19d7..5b4cd6e233c 100644
--- a/test/metabase/query_processor/middleware/process_userland_query_test.clj
+++ b/test/metabase/query_processor/middleware/process_userland_query_test.clj
@@ -7,12 +7,12 @@
[metabase.driver :as driver]
[metabase.events.core :as events]
[metabase.lib.core :as lib]
- [metabase.query-processor :as qp]
[metabase.query-processor.error-type :as qp.error-type]
[metabase.query-processor.middleware.process-userland-query :as process-userland-query]
[metabase.query-processor.pipeline :as qp.pipeline]
[metabase.query-processor.reducible :as qp.reducible]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util :as qp.util]
[metabase.test :as mt]
[methodical.core :as methodical]))
diff --git a/test/metabase/query_processor/middleware/remove_inactive_field_refs_test.clj b/test/metabase/query_processor/middleware/remove_inactive_field_refs_test.clj
index 5b21971dbc5..3c79c460b96 100644
--- a/test/metabase/query_processor/middleware/remove_inactive_field_refs_test.clj
+++ b/test/metabase/query_processor/middleware/remove_inactive_field_refs_test.clj
@@ -10,10 +10,10 @@
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
[metabase.lib.util :as lib.util]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.remove-inactive-field-refs :as remove-inactive-field-refs]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]))
diff --git a/test/metabase/query_processor/middleware/results_metadata_test.clj b/test/metabase/query_processor/middleware/results_metadata_test.clj
index 779ae788a59..a9723840fee 100644
--- a/test/metabase/query_processor/middleware/results_metadata_test.clj
+++ b/test/metabase/query_processor/middleware/results_metadata_test.clj
@@ -12,11 +12,11 @@
[metabase.lib.test-util :as lib.tu]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.middleware.results-metadata :as middleware.results-metadata]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util :as qp.util]
[metabase.test :as mt]
[metabase.util :as u]
diff --git a/test/metabase/query_processor/middleware/update_used_cards_test.clj b/test/metabase/query_processor/middleware/update_used_cards_test.clj
index f9947c680e1..fd9e1b4c78c 100644
--- a/test/metabase/query_processor/middleware/update_used_cards_test.clj
+++ b/test/metabase/query_processor/middleware/update_used_cards_test.clj
@@ -9,9 +9,9 @@
[metabase.pulse.dashboard-subscription-test :as dashboard-subscription-test]
[metabase.pulse.send :as pulse.send]
[metabase.pulse.send-test :as pulse.send-test]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.update-used-cards :as qp.update-used-cards]
[metabase.query-processor.pipeline :as qp.pipeline]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util :as qp.util]
[metabase.test :as mt]
[toucan2.core :as t2]))
diff --git a/test/metabase/query_processor/native_test.clj b/test/metabase/query_processor/native_test.clj
index ee2edb0ca07..a45707e6f87 100644
--- a/test/metabase/query_processor/native_test.clj
+++ b/test/metabase/query_processor/native_test.clj
@@ -7,9 +7,9 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.options :as lib.options]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.date-time-zone-functions-test :as dt-fn-test]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/test/metabase/query_processor/nested_field_test.clj b/test/metabase/query_processor/nested_field_test.clj
index 74680f93695..03f39c8942f 100644
--- a/test/metabase/query_processor/nested_field_test.clj
+++ b/test/metabase/query_processor/nested_field_test.clj
@@ -2,7 +2,7 @@
"Tests for nested field access."
(:require
[clojure.test :refer :all]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel filter-test
diff --git a/test/metabase/query_processor/nested_queries_test.clj b/test/metabase/query_processor/nested_queries_test.clj
index fb1e4c667b0..202e3e97156 100644
--- a/test/metabase/query_processor/nested_queries_test.clj
+++ b/test/metabase/query_processor/nested_queries_test.clj
@@ -20,11 +20,11 @@
[metabase.models.interface :as mi]
[metabase.permissions.core :as perms]
[metabase.query-permissions.core :as query-perms]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.middleware.permissions :as qp.perms]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/query_processor/offset_test.clj b/test/metabase/query_processor/offset_test.clj
index 1a0cf31141a..b1f1e631a68 100644
--- a/test/metabase/query_processor/offset_test.clj
+++ b/test/metabase/query_processor/offset_test.clj
@@ -8,7 +8,7 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]))
diff --git a/test/metabase/query_processor/order_by_test.clj b/test/metabase/query_processor/order_by_test.clj
index 117ab4765ce..6661bedae23 100644
--- a/test/metabase/query_processor/order_by_test.clj
+++ b/test/metabase/query_processor/order_by_test.clj
@@ -5,7 +5,7 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util.notebook-helpers :as lib.tu.notebook]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel order-by-test
diff --git a/test/metabase/query_processor/page_test.clj b/test/metabase/query_processor/page_test.clj
index 16c366188a1..763db30bc35 100644
--- a/test/metabase/query_processor/page_test.clj
+++ b/test/metabase/query_processor/page_test.clj
@@ -2,7 +2,7 @@
"Tests for the `:page` clause."
(:require
[clojure.test :refer :all]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(defn- page-is [expected page-num]
diff --git a/test/metabase/query_processor/parameters/temporal_units_test.clj b/test/metabase/query_processor/parameters/temporal_units_test.clj
index 819d57e4703..c16fe053626 100644
--- a/test/metabase/query_processor/parameters/temporal_units_test.clj
+++ b/test/metabase/query_processor/parameters/temporal_units_test.clj
@@ -4,7 +4,7 @@
[clojure.test :refer :all]
[java-time.api :as t]
[metabase.driver :as driver]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(defn- ->local-date-time [t]
diff --git a/test/metabase/query_processor/parameters_test.clj b/test/metabase/query_processor/parameters_test.clj
index 9c84172d2d5..f4cf86463d3 100644
--- a/test/metabase/query_processor/parameters_test.clj
+++ b/test/metabase/query_processor/parameters_test.clj
@@ -14,8 +14,8 @@
[metabase.lib.test-util :as lib.tu]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]))
diff --git a/test/metabase/query_processor/persistence_test.clj b/test/metabase/query_processor/persistence_test.clj
index 3394281c475..59be640c17d 100644
--- a/test/metabase/query_processor/persistence_test.clj
+++ b/test/metabase/query_processor/persistence_test.clj
@@ -9,9 +9,9 @@
[honey.sql :as sql]
[metabase.driver :as driver]
[metabase.driver.ddl.interface :as ddl.i]
- [metabase.query-processor :as qp]
[metabase.query-processor.metadata :as qp.metadata]
[metabase.query-processor.settings :as qp.settings]
+ [metabase.query-processor.test :as qp]
[metabase.system.core :as system]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/query_processor/pipeline_queries_test.clj b/test/metabase/query_processor/pipeline_queries_test.clj
index 32a305f0cbe..dd254c2bfa6 100644
--- a/test/metabase/query_processor/pipeline_queries_test.clj
+++ b/test/metabase/query_processor/pipeline_queries_test.clj
@@ -3,7 +3,7 @@
[clojure.test :refer :all]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/test/metabase/query_processor/pivot_test.clj b/test/metabase/query_processor/pivot_test.clj
index c8234410343..08b094a157c 100644
--- a/test/metabase/query_processor/pivot_test.clj
+++ b/test/metabase/query_processor/pivot_test.clj
@@ -13,11 +13,11 @@
[metabase.lib.test-util.notebook-helpers :as lib.tu.notebook]
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.pivot :as qp.pivot]
[metabase.query-processor.pivot.common :as pivot.common]
[metabase.query-processor.pivot.test-util :as qp.pivot.test-util]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data :as data]
[metabase.util :as u]
diff --git a/test/metabase/query_processor/preprocess_test.clj b/test/metabase/query_processor/preprocess_test.clj
index 2d18fcdbd2c..25a6931eb19 100644
--- a/test/metabase/query_processor/preprocess_test.clj
+++ b/test/metabase/query_processor/preprocess_test.clj
@@ -14,10 +14,10 @@
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
[metabase.lib.test-util.mocks-31769 :as lib.tu.mocks-31769]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.annotate :as annotate]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/query_processor/reducible_test.clj b/test/metabase/query_processor/reducible_test.clj
index 8b7aa4a14a1..f3bc7a3666f 100644
--- a/test/metabase/query_processor/reducible_test.clj
+++ b/test/metabase/query_processor/reducible_test.clj
@@ -5,8 +5,8 @@
[clojure.java.io :as io]
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase.query-processor :as qp]
[metabase.query-processor.pipeline :as qp.pipeline]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]))
diff --git a/test/metabase/query_processor/remapping_test.clj b/test/metabase/query_processor/remapping_test.clj
index ca1168e3215..57380aae73a 100644
--- a/test/metabase/query_processor/remapping_test.clj
+++ b/test/metabase/query_processor/remapping_test.clj
@@ -6,11 +6,11 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.middleware.add-remaps :as qp.add-remaps]
[metabase.query-processor.pivot :as qp.pivot]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.dataset-definitions :as defs]
diff --git a/test/metabase/query_processor/share_test.clj b/test/metabase/query_processor/share_test.clj
index dd9b2da7d23..8796daf0d5e 100644
--- a/test/metabase/query_processor/share_test.clj
+++ b/test/metabase/query_processor/share_test.clj
@@ -6,7 +6,7 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]))
diff --git a/test/metabase/query_processor/split_part_test.clj b/test/metabase/query_processor/split_part_test.clj
index fad81f09e4b..ac94e30e1af 100644
--- a/test/metabase/query_processor/split_part_test.clj
+++ b/test/metabase/query_processor/split_part_test.clj
@@ -4,7 +4,7 @@
[clojure.test :refer :all]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel split-part-test
diff --git a/test/metabase/query_processor/streaming/csv_test.clj b/test/metabase/query_processor/streaming/csv_test.clj
index 2bfea85599f..bed0c5f30e2 100644
--- a/test/metabase/query_processor/streaming/csv_test.clj
+++ b/test/metabase/query_processor/streaming/csv_test.clj
@@ -6,8 +6,8 @@
[metabase.driver :as driver]
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.streaming.interface :as qp.si]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.dataset-definitions :as defs])
(:import
diff --git a/test/metabase/query_processor/streaming/json_test.clj b/test/metabase/query_processor/streaming/json_test.clj
index bf58d2e1eef..123070e670e 100644
--- a/test/metabase/query_processor/streaming/json_test.clj
+++ b/test/metabase/query_processor/streaming/json_test.clj
@@ -1,8 +1,8 @@
(ns metabase.query-processor.streaming.json-test
(:require
[clojure.test :refer :all]
- [metabase.query-processor :as qp]
[metabase.query-processor.streaming :as qp.streaming]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt])
(:import
[java.io ByteArrayOutputStream OutputStream]))
diff --git a/test/metabase/query_processor/streaming/test_util.clj b/test/metabase/query_processor/streaming/test_util.clj
index d7f979b9982..a07391f90c8 100644
--- a/test/metabase/query_processor/streaming/test_util.clj
+++ b/test/metabase/query_processor/streaming/test_util.clj
@@ -5,8 +5,8 @@
[clojure.test :refer :all]
[dk.ative.docjure.spreadsheet :as spreadsheet]
[metabase.driver.settings :as driver.settings]
- [metabase.query-processor :as qp]
[metabase.query-processor.streaming :as qp.streaming]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.json :as json])
diff --git a/test/metabase/query_processor/streaming_test.clj b/test/metabase/query_processor/streaming_test.clj
index 83d51597a05..bfbc49cd4f1 100644
--- a/test/metabase/query_processor/streaming_test.clj
+++ b/test/metabase/query_processor/streaming_test.clj
@@ -8,13 +8,13 @@
[metabase.embedding-rest.api.embed-test :as embed-test]
[metabase.lib.test-util :as lib.tu]
[metabase.models.visualization-settings :as mb.viz]
- [metabase.query-processor :as qp]
[metabase.query-processor.pipeline :as qp.pipeline]
[metabase.query-processor.schema :as qp.schema]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.query-processor.streaming :as qp.streaming]
[metabase.query-processor.streaming.test-util :as streaming.test-util]
[metabase.query-processor.streaming.xlsx-test :as xlsx-test]
+ [metabase.query-processor.test :as qp]
[metabase.server.protocols :as server.protocols]
[metabase.test :as mt]
[metabase.util :as u]
diff --git a/test/metabase/query_processor/string_extracts_test.clj b/test/metabase/query_processor/string_extracts_test.clj
index 10996f7ecde..2b93490aa89 100644
--- a/test/metabase/query_processor/string_extracts_test.clj
+++ b/test/metabase/query_processor/string_extracts_test.clj
@@ -4,7 +4,7 @@
[metabase.driver :as driver]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(defn- test-string-extract
diff --git a/test/metabase/query_processor/temporal_bucket_test.clj b/test/metabase/query_processor/temporal_bucket_test.clj
index aee938f719c..18011b02bab 100644
--- a/test/metabase/query_processor/temporal_bucket_test.clj
+++ b/test/metabase/query_processor/temporal_bucket_test.clj
@@ -4,7 +4,7 @@
[medley.core :as m]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
(deftest ^:parallel temporal-unit-in-display-name-test
diff --git a/test/metabase/query_processor/test.clj b/test/metabase/query_processor/test.clj
new file mode 100644
index 00000000000..7fd59aac5f3
--- /dev/null
+++ b/test/metabase/query_processor/test.clj
@@ -0,0 +1,74 @@
+(ns metabase.query-processor.test
+ "Test facade for the query-processor module. Re-exports everything from [[metabase.query-processor.core]]
+ plus broadly-useful test utilities, so test namespaces only need a single require:
+
+ (:require [metabase.query-processor.test :as qp])"
+ (:refer-clojure :exclude [compile])
+ (:require
+ [metabase.query-processor.core :as qp.core]
+ [metabase.query-processor.test-util :as qp.test-util]
+ [metabase.util.namespaces :as shared.ns]))
+
+(shared.ns/import-fns
+ ;; Core QP operations — metabase.query-processor.core
+ [qp.core
+ compile
+ compile-with-inline-parameters
+ combined-parameters-and-template-tags
+ database-timezone-id
+ default-query-constraints
+ default-query->remark
+ internal-query?
+ order-cols
+ preprocess
+ process-query
+ process-query-for-card
+ process-query-for-card-default-qp
+ process-query-for-dashcard
+ query->expected-cols
+ query->remark
+ query-hash
+ query-for-card
+ report-timezone-id-if-supported
+ requested-timezone-id
+ result-metadata
+ results-timezone-id
+ run-pivot-query
+ streaming-response
+ system-timezone-id
+ userland-query
+ userland-query-with-default-constraints
+ userland-query?]
+ ;; Test utilities — metabase.query-processor.test-util
+ [qp.test-util
+ ;; Driver sets
+ normal-drivers
+ normal-drivers-with-feature
+ normal-drivers-without-feature
+ ;; Result extraction
+ data
+ rows
+ cols
+ first-row
+ rows-and-cols
+ rows+column-names
+ formatted-rows
+ formatted-rows+column-names
+ format-rows-by
+ boolish->bool
+ ;; Timezone test helpers
+ supports-report-timezone?
+ tz-shifted-driver-bug?
+ with-database-timezone-id
+ with-report-timezone-id!
+ with-results-timezone-id
+ ;; Metadata providers for tests
+ card-with-metadata
+ card-with-source-metadata-for-query
+ card-with-updated-metadata
+ metadata-provider-with-cards-for-queries
+ metadata-provider-with-cards-with-metadata-for-queries
+ metadata-provider-with-cards-with-transformed-metadata-for-queries
+ mock-fks-application-database-metadata-provider
+ ;; Misc
+ field-values-from-def])
diff --git a/test/metabase/query_processor/test_util.clj b/test/metabase/query_processor/test_util.clj
index e9cb9af2891..8739b6eaaff 100644
--- a/test/metabase/query_processor/test_util.clj
+++ b/test/metabase/query_processor/test_util.clj
@@ -19,8 +19,8 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.schema.metadata :as lib.schema.metadata]
[metabase.lib.test-util :as lib.tu]
- [metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
+ [metabase.query-processor.core :as qp]
[metabase.query-processor.preprocess :as qp.preprocess]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.query-processor.timezone :as qp.timezone]
diff --git a/test/metabase/query_processor/time_field_test.clj b/test/metabase/query_processor/time_field_test.clj
index 69691beb2a5..b35ee5ca592 100644
--- a/test/metabase/query_processor/time_field_test.clj
+++ b/test/metabase/query_processor/time_field_test.clj
@@ -4,7 +4,7 @@
[metabase.driver :as driver]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]))
diff --git a/test/metabase/query_processor/timezones_test.clj b/test/metabase/query_processor/timezones_test.clj
index 6f2eceed042..f6c830f1344 100644
--- a/test/metabase/query_processor/timezones_test.clj
+++ b/test/metabase/query_processor/timezones_test.clj
@@ -8,8 +8,8 @@
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.util :as driver.u]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.data.sql :as sql.tx]
[metabase.util.date-2 :as u.date]))
diff --git a/test/metabase/query_processor/util/nest_query_test.clj b/test/metabase/query_processor/util/nest_query_test.clj
index 71afea782c7..51c12de75c1 100644
--- a/test/metabase/query_processor/util/nest_query_test.clj
+++ b/test/metabase/query_processor/util/nest_query_test.clj
@@ -7,8 +7,8 @@
[metabase.lib.test-util :as lib.tu]
[metabase.lib.test-util.macros :as lib.tu.macros]
[metabase.lib.test-util.places-cam-likes-metadata-provider :as lib.tu.places-cam-likes-metadata-provider]
- [metabase.query-processor :as qp]
[metabase.query-processor.preprocess :as qp.preprocess]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.util.add-alias-info :as add]
[metabase.query-processor.util.nest-query :as nest-query]
[metabase.test :as mt]))
diff --git a/test/metabase/query_processor/util/relative_datetime_test.clj b/test/metabase/query_processor/util/relative_datetime_test.clj
index 238dd52f347..aa34f4d5c4c 100644
--- a/test/metabase/query_processor/util/relative_datetime_test.clj
+++ b/test/metabase/query_processor/util/relative_datetime_test.clj
@@ -5,7 +5,7 @@
[java-time.api :as t]
[metabase.driver :as driver]
[metabase.driver.sql.query-processor :as sql.qp]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.query-processor.util.relative-datetime :as qp.relative-datetime]
[metabase.test :as mt]
diff --git a/test/metabase/query_processor/uuid_test.clj b/test/metabase/query_processor/uuid_test.clj
index 538b41d7c50..f89dd059c63 100644
--- a/test/metabase/query_processor/uuid_test.clj
+++ b/test/metabase/query_processor/uuid_test.clj
@@ -3,7 +3,7 @@
(:require
[clojure.test :refer :all]
[metabase.driver :as driver]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]))
;; Athena supports uuids in queries, but not in create table
diff --git a/test/metabase/sync/sync_metadata/fields_test.clj b/test/metabase/sync/sync_metadata/fields_test.clj
index 421e4a58f88..d75eb79fbcc 100644
--- a/test/metabase/sync/sync_metadata/fields_test.clj
+++ b/test/metabase/sync/sync_metadata/fields_test.clj
@@ -7,7 +7,7 @@
[medley.core :as m]
[metabase.driver :as driver]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.sync.sync-metadata :as sync-metadata]
[metabase.sync.sync-metadata.fields :as sync-fields]
diff --git a/test/metabase/test.clj b/test/metabase/test.clj
index 52282da052f..f7f6faa8b89 100644
--- a/test/metabase/test.clj
+++ b/test/metabase/test.clj
@@ -20,8 +20,8 @@
[metabase.model-persistence.test-util]
[metabase.permissions.test-util :as perms.test-util]
[metabase.premium-features.test-util :as premium-features.test-util]
- [metabase.query-processor :as qp]
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.request.core]
[metabase.test-runner.assert-exprs :as test-runner.assert-exprs]
diff --git a/test/metabase/test/data.clj b/test/metabase/test/data.clj
index 8e977bf0d03..bc6bff49c27 100644
--- a/test/metabase/test/data.clj
+++ b/test/metabase/test/data.clj
@@ -48,7 +48,7 @@
[metabase.lib-be.core :as lib-be]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.test.data.env :as tx.env]
[metabase.test.data.impl :as data.impl]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/test/data/impl/verify.clj b/test/metabase/test/data/impl/verify.clj
index 259c583848f..4263eecf81c 100644
--- a/test/metabase/test/data/impl/verify.clj
+++ b/test/metabase/test/data/impl/verify.clj
@@ -2,7 +2,7 @@
"Logic for verifying that test data was loaded correctly."
(:require
[metabase.driver :as driver]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.core :as qp]
[metabase.test.data.interface :as tx]
[metabase.util :as u]
[metabase.util.log :as log]
diff --git a/test/metabase/transforms/execute_test.clj b/test/metabase/transforms/execute_test.clj
index 98d8ee5e94c..98da3f1d2a3 100644
--- a/test/metabase/transforms/execute_test.clj
+++ b/test/metabase/transforms/execute_test.clj
@@ -7,7 +7,7 @@
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
diff --git a/test/metabase/transforms_rest/api/transform_test.clj b/test/metabase/transforms_rest/api/transform_test.clj
index 8ae5e25291a..f4a7c1c705a 100644
--- a/test/metabase/transforms_rest/api/transform_test.clj
+++ b/test/metabase/transforms_rest/api/transform_test.clj
@@ -8,7 +8,7 @@
[metabase.models.transforms.transform :as transform.model]
[metabase.permissions.core :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.search.test-util :as search.tu]
[metabase.test :as mt]
[metabase.transforms-base.util :as transforms-base.u]
diff --git a/test/metabase/upload/impl_test.clj b/test/metabase/upload/impl_test.clj
index 611e66ce4e0..a973dac8bf7 100644
--- a/test/metabase/upload/impl_test.clj
+++ b/test/metabase/upload/impl_test.clj
@@ -24,7 +24,7 @@
[metabase.permissions.core :as perms]
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.sync.sync-metadata.tables :as sync-tables]
[metabase.test :as mt]
[metabase.test.data.impl :as data.impl]
diff --git a/test/metabase/xrays/api/automagic_dashboards_test.clj b/test/metabase/xrays/api/automagic_dashboards_test.clj
index c83ded1756e..119eb7849db 100644
--- a/test/metabase/xrays/api/automagic_dashboards_test.clj
+++ b/test/metabase/xrays/api/automagic_dashboards_test.clj
@@ -7,7 +7,7 @@
[metabase.permissions.core :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
[metabase.permissions.test-util :as perms.test-util]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[metabase.util :as u]
diff --git a/test/metabase/xrays/automagic_dashboards/core_test.clj b/test/metabase/xrays/automagic_dashboards/core_test.clj
index e12f8cc297b..982bc10b513 100644
--- a/test/metabase/xrays/automagic_dashboards/core_test.clj
+++ b/test/metabase/xrays/automagic_dashboards/core_test.clj
@@ -14,9 +14,9 @@
[metabase.models.interface :as mi]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
- [metabase.query-processor :as qp]
[metabase.query-processor.card-test :as qp.card-test]
[metabase.query-processor.metadata :as qp.metadata]
+ [metabase.query-processor.test :as qp]
[metabase.query-processor.test-util :as qp.test-util]
[metabase.test :as mt]
[metabase.util :as u]
diff --git a/test/metabase/xrays/transforms/core_test.clj b/test/metabase/xrays/transforms/core_test.clj
index 1a6d1ac0acd..0566104ba19 100644
--- a/test/metabase/xrays/transforms/core_test.clj
+++ b/test/metabase/xrays/transforms/core_test.clj
@@ -3,7 +3,7 @@
[clojure.test :refer :all]
[medley.core :as m]
[metabase.models.interface :as mi]
- [metabase.query-processor :as qp]
+ [metabase.query-processor.test :as qp]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[metabase.util :as u]