Skip to content

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

Standardize where models live (#72096)

Chris Truter8a869177f436
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index ebf49594ca6..41b20e42d11 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -68,6 +68,7 @@
:metabase/modules {:level :warning} ; more config in `.clj-kondo/config/modules/config.edn`
:metabase/namespace-name {:level :warning}
:metabase/no-jsqlparser-imports {:level :warning}
+ :metabase/toucan-model-ns {:level :warning}
:metabase/require-shape-checker {:level :warning}
:metabase/tests-must-live-in-known-modules {:level :warning}
:metabase/validate-defendpoint-route-uses-kebab-case {:level :warning}
@@ -590,6 +591,8 @@
metabase.lib.schema.mbql-clause/define-catn-mbql-clause hooks.metabase.lib.schema.mbql-clause/define-mbql-clause
metabase.lib.schema.mbql-clause/define-mbql-clause hooks.metabase.lib.schema.mbql-clause/define-mbql-clause
metabase.lib.schema.mbql-clause/define-tuple-mbql-clause hooks.metabase.lib.schema.mbql-clause/define-mbql-clause
+ methodical.core/defmethod hooks.metabase.toucan.table-name/lint-defmethod
+ methodical.macros/defmethod hooks.metabase.toucan.table-name/lint-defmethod
metabase.lib.test-util.macros/$ids hooks.metabase.test.data/$ids
metabase.lib.test-util.macros/mbql-query hooks.metabase.test.data/mbql-query
metabase.lib.test-util.macros/mbql-5-query hooks.metabase.test.data/mbql-query
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 246d7059219..ccb92d66985 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -1253,7 +1253,10 @@
request
server
util}
- :model-imports #{:model/Card :model/Field :model/Measure :model/Table}}
+ :model-imports #{:model/Card
+ :model/Field
+ :model/Measure
+ :model/Table}}
model-persistence
{:team "Graphy"
@@ -1287,33 +1290,15 @@
metabase.models.interface
metabase.models.resolution
metabase.models.serialization
- metabase.models.transforms.transform
metabase.models.util.spec-update
metabase.models.visualization-settings}
:uses #{api
app-db
classloader
- collections
- events
legacy-mbql
lib
- lib-be
- permissions
- query-processor
- remote-sync
- search
settings
- transforms
- transforms-base
- util
- warehouse-schema}
- :friends #{transforms}
- :model-exports #{:model/Transform
- :model/TransformJob
- :model/TransformJobTransformTag
- :model/TransformRun
- :model/TransformTag
- :model/TransformTransformTag}
+ util}
:model-imports #{:model/Card
:model/Collection
:model/Dashboard
@@ -2203,32 +2188,41 @@
metabase.transforms.util}
:uses #{analytics
api
+ app-db
channel
+ collections
database-routing
driver
events
lib
+ lib-be
models
+ permissions
premium-features
queries
query-processor
+ remote-sync
revisions
+ search
settings
task
task-history
tracing
transforms-base
- util}
+ util
+ warehouse-schema}
:friends #{models
enterprise/transforms-python
enterprise/workspaces}
- :model-imports #{:model/Database
- :model/Field
- :model/Table
- :model/Transform
+ :model-exports #{:model/Transform
:model/TransformJob
:model/TransformJobTransformTag
- :model/TransformTransformTag
+ :model/TransformRun
+ :model/TransformTag}
+ :model-imports #{:model/Collection
+ :model/Database
+ :model/Field
+ :model/Table
:model/User}}
transforms-base
@@ -2833,8 +2827,7 @@
warehouse-schema
warehouses}
:model-exports #{:model/DatabaseRouter}
- :model-imports #{:model/Database
- :model/Transform}}
+ :model-imports #{:model/Database :model/Transform}}
enterprise/dependencies
{:team "Graphy"
diff --git a/.clj-kondo/src/hooks/metabase/toucan/table_name.clj b/.clj-kondo/src/hooks/metabase/toucan/table_name.clj
new file mode 100644
index 00000000000..1ba186c64cf
--- /dev/null
+++ b/.clj-kondo/src/hooks/metabase/toucan/table_name.clj
@@ -0,0 +1,43 @@
+(ns hooks.metabase.toucan.table-name
+ "Lint that toucan2 model namespaces (those defining `t2/table-name`) live
+ under `metabase[-enterprise]/<module>/models[/…]`.
+
+ This wraps the methodical `defmethod` hook: we delegate to
+ `hooks.methodical.macros/defmethod` for the actual analysis (so arg bindings
+ etc. still work), and additionally check the file location when the
+ multimethod being defined is `t2/table-name`."
+ (:require
+ [clj-kondo.hooks-api :as hooks]))
+
+(defn- models-file? [filename]
+ (boolean
+ (and filename
+ (re-find #"/(?:metabase|metabase_enterprise)/[^/]+/models(?:/|\.clj[cs]?$)"
+ filename))))
+
+(defn- table-name-dispatch? [sym]
+ (and (symbol? sym)
+ (= (name sym) "table-name")
+ (#{"t2" "toucan2.core"} (namespace sym))))
+
+(defn lint-defmethod
+ "Hook registered at the project level on `methodical.core/defmethod` (and
+ `methodical.macros/defmethod`). Performs the table-name check, then
+ delegates to the vendored methodical hook so kondo's normal analysis of the
+ defmethod body still runs."
+ [{:keys [filename node] :as input}]
+ (let [[_defmethod multimethod & _args] (:children node)
+ dispatch (when multimethod
+ (try (hooks/sexpr multimethod) (catch Exception _ nil)))]
+ (when (and (table-name-dispatch? dispatch)
+ (not (models-file? filename)))
+ (hooks/reg-finding!
+ (assoc (meta multimethod)
+ :message (format "Toucan2 `table-name` defmethods must live under `<module>/models[/…]` (got %s)"
+ filename)
+ :type :metabase/toucan-model-ns))))
+ ;; Delegate to the vendored methodical defmethod hook so kondo's normal
+ ;; analysis of the defmethod body still runs. Resolved lazily because
+ ;; `hooks.methodical.macros` isn't on the classpath during `.clj-kondo/test`
+ ;; unit-test runs.
+ ((requiring-resolve 'hooks.methodical.macros/defmethod) input))
diff --git a/.clj-kondo/test/hooks/metabase/toucan/table_name_test.clj b/.clj-kondo/test/hooks/metabase/toucan/table_name_test.clj
new file mode 100644
index 00000000000..7792ba6cd26
--- /dev/null
+++ b/.clj-kondo/test/hooks/metabase/toucan/table_name_test.clj
@@ -0,0 +1,46 @@
+(ns hooks.metabase.toucan.table-name-test
+ (:require
+ [clj-kondo.hooks-api :as hooks]
+ [clj-kondo.impl.utils]
+ [clojure.test :refer :all]
+ [hooks.metabase.toucan.table-name :as toucan.table-name]))
+
+;; `hooks.methodical.macros` isn't on the classpath under `.clj-kondo/test`,
+;; so stub it out — `lint-defmethod` delegates to it via `requiring-resolve`.
+;; If it ever becomes available, warn so we remember to delete this stub.
+(if (find-ns 'hooks.methodical.macros)
+ (println (str "WARNING: hooks.methodical.macros is now on the test classpath; "
+ "the stub in " *ns* " is no longer needed and can be removed."))
+ (do (create-ns 'hooks.methodical.macros)
+ (intern 'hooks.methodical.macros 'defmethod (fn [input] input))))
+
+(defn- lint-defmethod [form filename]
+ (binding [clj-kondo.impl.utils/*ctx* {:config {:linters {:metabase/toucan-model-ns {:level :warning}}}
+ :ignores (atom nil)
+ :findings (atom [])
+ :namespaces (atom {})}]
+ (toucan.table-name/lint-defmethod {:node (hooks/parse-string (pr-str form))
+ :filename filename})
+ @(:findings clj-kondo.impl.utils/*ctx*)))
+
+(deftest ^:parallel table-name-must-live-in-models-namespace-test
+ (testing "defmethod t2/table-name outside a models namespace is flagged"
+ (is (=? [{:type :metabase/toucan-model-ns}]
+ (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
+ "/repo/src/metabase/foo/core.clj"))))
+ (testing "defmethod t2/table-name inside <module>/models.clj is allowed"
+ (is (empty? (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
+ "/repo/src/metabase/foo/models.clj"))))
+ (testing "defmethod t2/table-name inside <module>/models/<model>.clj is allowed"
+ (is (empty? (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
+ "/repo/src/metabase/foo/models/bar.clj"))))
+ (testing "enterprise modules are also allowed"
+ (is (empty? (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
+ "/repo/enterprise/backend/src/metabase_enterprise/foo/models.clj"))))
+ (testing "toucan2.core/table-name is also recognized"
+ (is (=? [{:type :metabase/toucan-model-ns}]
+ (lint-defmethod '(defmethod toucan2.core/table-name :model/Foo [_] :foo)
+ "/repo/src/metabase/foo/core.clj"))))
+ (testing "unrelated defmethods are ignored"
+ (is (empty? (lint-defmethod '(defmethod t2/primary-keys :model/Foo [_] [:id])
+ "/repo/src/metabase/foo/core.clj")))))
diff --git a/.config/wt.toml b/.config/wt.toml
new file mode 100644
index 00000000000..d971e2f9aae
--- /dev/null
+++ b/.config/wt.toml
@@ -0,0 +1,10 @@
+# worktrunk project config — https://worktrunk.dev
+# Hooks run when switching, creating, merging, or removing worktrees.
+
+# Setup tasks for newly-created worktrees. Run once, blocking, in the
+# new worktree's cwd before post-start background tasks kick off.
+[pre-start]
+# Trust mise config so it loads the project's tool versions without prompting.
+trust-mise = "mise trust"
+# Install JS deps so husky git hooks get wired up in the new worktree.
+bun-install = "bun install"
diff --git a/enterprise/backend/src/metabase_enterprise/database_routing/model.clj b/enterprise/backend/src/metabase_enterprise/database_routing/models.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/database_routing/model.clj
rename to enterprise/backend/src/metabase_enterprise/database_routing/models.clj
index 6eea6771c9e..eddea3388c9 100644
--- a/enterprise/backend/src/metabase_enterprise/database_routing/model.clj
+++ b/enterprise/backend/src/metabase_enterprise/database_routing/models.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.database-routing.model
+(ns metabase-enterprise.database-routing.models
(:require
[metabase-enterprise.database-routing.common :refer [router-db-or-id->destination-db-id]]
[metabase.models.interface :as mi]
diff --git a/enterprise/backend/src/metabase_enterprise/impersonation/model.clj b/enterprise/backend/src/metabase_enterprise/impersonation/models.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/impersonation/model.clj
rename to enterprise/backend/src/metabase_enterprise/impersonation/models.clj
index ad7007afb68..d2f4a052102 100644
--- a/enterprise/backend/src/metabase_enterprise/impersonation/model.clj
+++ b/enterprise/backend/src/metabase_enterprise/impersonation/models.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.impersonation.model
+(ns metabase-enterprise.impersonation.models
"Model definition for Connection Impersonations, which are used to define specific database roles used by users in
certain permission groups when running queries."
(:require
diff --git a/enterprise/backend/src/metabase_enterprise/tenants/api.clj b/enterprise/backend/src/metabase_enterprise/tenants/api.clj
index 522189b0065..e281b3f56a4 100644
--- a/enterprise/backend/src/metabase_enterprise/tenants/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/tenants/api.clj
@@ -1,7 +1,7 @@
(ns metabase-enterprise.tenants.api
(:require
[malli.util]
- [metabase-enterprise.tenants.model :as tenant]
+ [metabase-enterprise.tenants.models :as tenant]
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
diff --git a/enterprise/backend/src/metabase_enterprise/tenants/model.clj b/enterprise/backend/src/metabase_enterprise/tenants/models.clj
similarity index 99%
rename from enterprise/backend/src/metabase_enterprise/tenants/model.clj
rename to enterprise/backend/src/metabase_enterprise/tenants/models.clj
index c2fa577d67b..86d80eaddd6 100644
--- a/enterprise/backend/src/metabase_enterprise/tenants/model.clj
+++ b/enterprise/backend/src/metabase_enterprise/tenants/models.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.tenants.model
+(ns metabase-enterprise.tenants.models
(:require
[metabase.api.common :as api]
[metabase.audit-app.core :as audit-app]
diff --git a/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace_transform.clj b/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace_transform.clj
index 58b66c28224..2f8001c8564 100644
--- a/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace_transform.clj
+++ b/enterprise/backend/src/metabase_enterprise/workspaces/models/workspace_transform.clj
@@ -4,7 +4,7 @@
(:require
[clojure.string :as str]
[metabase.models.interface :as mi]
- [metabase.models.transforms.transform :as transform]
+ [metabase.transforms.models.transform :as transform]
[methodical.core :as methodical]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/models_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/models_test.clj
index 02e78f6c147..8e140af3b11 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/models_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/models_test.clj
@@ -2,7 +2,7 @@
(:require
[clojure.set :as set]
[clojure.test :refer :all]
- [metabase-enterprise.impersonation.model]
+ [metabase-enterprise.impersonation.models]
[metabase-enterprise.serialization.v2.backfill-ids :as serdes.backfill]
[metabase-enterprise.serialization.v2.entity-ids :as v2.entity-ids]
[metabase-enterprise.serialization.v2.models :as serdes.models]
@@ -14,7 +14,7 @@
[toucan2.core :as t2]))
(comment
- metabase-enterprise.impersonation.model/keep-me)
+ metabase-enterprise.impersonation.models/keep-me)
(defn- parse-default-value
"Parse a default value string into a Clojure value.
diff --git a/enterprise/backend/test/metabase_enterprise/tenants/model_test.clj b/enterprise/backend/test/metabase_enterprise/tenants/models_test.clj
similarity index 99%
rename from enterprise/backend/test/metabase_enterprise/tenants/model_test.clj
rename to enterprise/backend/test/metabase_enterprise/tenants/models_test.clj
index b334ef84e5b..99d5a32abb5 100644
--- a/enterprise/backend/test/metabase_enterprise/tenants/model_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/tenants/models_test.clj
@@ -1,7 +1,7 @@
-(ns metabase-enterprise.tenants.model-test
+(ns metabase-enterprise.tenants.models-test
(:require
[clojure.test :refer [deftest testing is]]
- [metabase-enterprise.tenants.model :as tenants.model]
+ [metabase-enterprise.tenants.models :as tenants.model]
[metabase.collections.models.collection :as collection]
[metabase.test :as mt]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/core_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/core_test.clj
index 725aee39eac..db1d607fb73 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/core_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/core_test.clj
@@ -2,10 +2,10 @@
(:require
[clojure.test :refer :all]
[java-time.api :as t]
- [metabase.models.transforms.transform-run :as transform-run]
[metabase.premium-features.core :as premium-features]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
+ [metabase.transforms.models.transform-run :as transform-run]
[toucan2.core :as t2]))
(set! *warn-on-reflection* true)
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj
index e239e0991b4..d090709a415 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/job_test.clj
@@ -4,10 +4,10 @@
^{:clj-kondo/ignore [:discouraged-namespace]}
[clojure.tools.logging :as log]
[metabase.driver :as driver]
- [metabase.models.transforms.transform-run :as transform-run]
[metabase.task.core :as task]
[metabase.test :as mt]
[metabase.transforms.jobs :as jobs]
+ [metabase.transforms.models.transform-run :as transform-run]
[metabase.transforms.schedule :as transforms.schedule]
[metabase.transforms.test-dataset :as transforms-dataset]
[metabase.transforms.test-util :as transforms.tu]
diff --git a/src/metabase/collections/models/collection.clj b/src/metabase/collections/models/collection.clj
index 044174ce4f9..5d6cde76558 100644
--- a/src/metabase/collections/models/collection.clj
+++ b/src/metabase/collections/models/collection.clj
@@ -526,7 +526,7 @@
"For tenant root collections, localize the name to the user's locale.
OSS version: returns collections unchanged."
- metabase-enterprise.tenants.model
+ metabase-enterprise.tenants.models
[collections]
collections)
diff --git a/src/metabase/database_routing/core.clj b/src/metabase/database_routing/core.clj
index 6b0d9601279..813e3c8cebd 100644
--- a/src/metabase/database_routing/core.clj
+++ b/src/metabase/database_routing/core.clj
@@ -38,12 +38,12 @@
(defenterprise delete-associated-database-router!
"OSS version, does nothing"
- metabase-enterprise.database-routing.model
+ metabase-enterprise.database-routing.models
[_db-id]
nil)
(defenterprise db-routing-enabled?
"Returns whether or not the given database is either a router or destination database."
- metabase-enterprise.database-routing.model
+ metabase-enterprise.database-routing.models
[_db-or-id]
false)
diff --git a/src/metabase/models/resolution.clj b/src/metabase/models/resolution.clj
index 5f2657cbcec..6ad0775788c 100644
--- a/src/metabase/models/resolution.clj
+++ b/src/metabase/models/resolution.clj
@@ -31,7 +31,7 @@
:model/CollectionPermissionGraphRevision metabase.permissions.models.collection-permission-graph-revision
:model/Comment metabase.comments.models.comment
:model/CommentReaction metabase.comments.models.comment-reaction
- :model/ConnectionImpersonation metabase-enterprise.impersonation.model
+ :model/ConnectionImpersonation metabase-enterprise.impersonation.models
:model/ContentTranslation metabase.content-translation.models
:model/Dashboard metabase.dashboards.models.dashboard
:model/DashboardBookmark metabase.bookmarks.models.bookmark
@@ -40,7 +40,7 @@
:model/DashboardTab metabase.dashboards.models.dashboard-tab
:model/DataPermissions metabase.permissions.models.data-permissions
:model/Database metabase.warehouses.models.database
- :model/DatabaseRouter metabase-enterprise.database-routing.model
+ :model/DatabaseRouter metabase-enterprise.database-routing.models
:model/Dependency metabase-enterprise.dependencies.models.dependency
:model/Dimension metabase.warehouse-schema.models.dimension
:model/Document metabase.documents.models.document
@@ -108,17 +108,17 @@
:model/Table metabase.warehouse-schema.models.table
:model/TaskHistory metabase.task-history.models.task-history
:model/TaskRun metabase.task-history.models.task-run
- :model/Tenant metabase-enterprise.tenants.model
+ :model/Tenant metabase-enterprise.tenants.models
:model/Timeline metabase.timeline.models.timeline
:model/TimelineEvent metabase.timeline.models.timeline-event
- :model/Transform metabase.models.transforms.transform
- :model/TransformJob metabase.models.transforms.transform-job
- :model/TransformJobRun metabase.models.transforms.job-run
- :model/TransformJobTransformTag metabase.models.transforms.transform-job-transform-tag
- :model/TransformRun metabase.models.transforms.transform-run
- :model/TransformRunCancelation metabase.models.transforms.transform-run-cancelation
- :model/TransformTag metabase.models.transforms.transform-tag
- :model/TransformTransformTag metabase.models.transforms.transform-transform-tag
+ :model/Transform metabase.transforms.models.transform
+ :model/TransformJob metabase.transforms.models.transform-job
+ :model/TransformJobRun metabase.transforms.models.job-run
+ :model/TransformJobTransformTag metabase.transforms.models.transform-job-transform-tag
+ :model/TransformRun metabase.transforms.models.transform-run
+ :model/TransformRunCancelation metabase.transforms.models.transform-run-cancelation
+ :model/TransformTag metabase.transforms.models.transform-tag
+ :model/TransformTransformTag metabase.transforms.models.transform-transform-tag
:model/Undo metabase-enterprise.action-v2.models.undo
:model/User metabase.users.models.user
:model/UserKeyValue metabase.user-key-value.models.user-key-value
diff --git a/src/metabase/permissions/user.clj b/src/metabase/permissions/user.clj
index f8c12275600..0a5ca6ac1fc 100644
--- a/src/metabase/permissions/user.clj
+++ b/src/metabase/permissions/user.clj
@@ -11,7 +11,7 @@
(defenterprise user->tenant-collection-and-descendant-ids
"Returns descendant IDs for the user's tenant collection. Returns an empty vector in OSS since tenants are an EE feature."
- metabase-enterprise.tenants.model
+ metabase-enterprise.tenants.models
[_user-or-id]
[])
diff --git a/src/metabase/permissions_rest/api.clj b/src/metabase/permissions_rest/api.clj
index a0d8dd5377c..f52d5cea1fd 100644
--- a/src/metabase/permissions_rest/api.clj
+++ b/src/metabase/permissions_rest/api.clj
@@ -61,7 +61,7 @@
(defenterprise insert-impersonations!
"OSS implementation of `insert-impersonations!`. Errors since this is an enterprise feature."
- metabase-enterprise.impersonation.model
+ metabase-enterprise.impersonation.models
[_impersonations]
(throw (premium-features/ee-feature-error (tru "Connection impersonation"))))
diff --git a/src/metabase/permissions_rest/data_permissions/graph.clj b/src/metabase/permissions_rest/data_permissions/graph.clj
index fcc971320e9..8f559fa8966 100644
--- a/src/metabase/permissions_rest/data_permissions/graph.clj
+++ b/src/metabase/permissions_rest/data_permissions/graph.clj
@@ -46,7 +46,7 @@
(defenterprise add-impersonations-to-permissions-graph
"Augment the permissions graph with active connection impersonation policies. OSS implementation returns graph as-is."
- metabase-enterprise.impersonation.model
+ metabase-enterprise.impersonation.models
[graph & [_opts]]
graph)
@@ -266,7 +266,7 @@
(defenterprise delete-impersonations-if-needed-after-permissions-change!
"Delete connection impersonation policies that are no longer needed after the permissions graph is updated. This is
EE-specific -- OSS impl is a no-op, since connection impersonation is an EE-only feature."
- metabase-enterprise.impersonation.model
+ metabase-enterprise.impersonation.models
[_])
(defn ee-permissions-exception
diff --git a/src/metabase/transforms/canceling.clj b/src/metabase/transforms/canceling.clj
index 8482a03cd0b..9e3ceacc565 100644
--- a/src/metabase/transforms/canceling.clj
+++ b/src/metabase/transforms/canceling.clj
@@ -4,9 +4,9 @@
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.calendar-interval :as calendar-interval]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase.models.transforms.transform-run :as transform-run]
- [metabase.models.transforms.transform-run-cancelation :as wr.cancelation]
[metabase.task.core :as task]
+ [metabase.transforms.models.transform-run :as transform-run]
+ [metabase.transforms.models.transform-run-cancelation :as wr.cancelation]
[metabase.util.jvm :as u.jvm]
[metabase.util.log :as log])
(:import
diff --git a/src/metabase/transforms/core.clj b/src/metabase/transforms/core.clj
index 018deb2c2d5..19689a08ac8 100644
--- a/src/metabase/transforms/core.clj
+++ b/src/metabase/transforms/core.clj
@@ -1,17 +1,17 @@
(ns metabase.transforms.core
"API namespace for the `metabase.transforms` module."
(:require
- [metabase.models.transforms.transform]
- [metabase.models.transforms.transform-job]
- [metabase.models.transforms.transform-run]
- [metabase.models.transforms.transform-run-cancelation]
- [metabase.models.transforms.transform-tag]
[metabase.transforms-base.ordering]
[metabase.transforms-base.util]
[metabase.transforms.canceling]
[metabase.transforms.crud]
[metabase.transforms.execute]
[metabase.transforms.jobs]
+ [metabase.transforms.models.transform]
+ [metabase.transforms.models.transform-job]
+ [metabase.transforms.models.transform-run]
+ [metabase.transforms.models.transform-run-cancelation]
+ [metabase.transforms.models.transform-tag]
[metabase.transforms.schedule]
[metabase.transforms.settings]
[metabase.transforms.util]
@@ -57,16 +57,16 @@
update-job!
delete-job!
existing-trigger]
- [metabase.models.transforms.transform
+ [metabase.transforms.models.transform
update-transform-tags!]
- [metabase.models.transforms.transform-run
+ [metabase.transforms.models.transform-run
timeout-run!
paged-runs
running-run-for-transform-id]
- [metabase.models.transforms.transform-run-cancelation
+ [metabase.transforms.models.transform-run-cancelation
mark-cancel-started-run!]
- [metabase.models.transforms.transform-job
+ [metabase.transforms.models.transform-job
update-job-tags!]
- [metabase.models.transforms.transform-tag
+ [metabase.transforms.models.transform-tag
tag-name-exists?
tag-name-exists-excluding?])
diff --git a/src/metabase/transforms/crud.clj b/src/metabase/transforms/crud.clj
index 374be5a9cd5..de7bf8b22c0 100644
--- a/src/metabase/transforms/crud.clj
+++ b/src/metabase/transforms/crud.clj
@@ -8,10 +8,10 @@
[metabase.driver.util :as driver.u]
[metabase.events.core :as events]
[metabase.models.interface :as mi]
- [metabase.models.transforms.transform :as transform.model]
[metabase.transforms-base.interface :as transforms-base.i]
[metabase.transforms-base.ordering :as transforms-base.ordering]
[metabase.transforms-base.util :as transforms-base.u]
+ [metabase.transforms.models.transform :as transform.model]
[metabase.transforms.util :as transforms.u]
[metabase.util :as u]
[metabase.util.i18n :refer [deferred-tru]]
diff --git a/src/metabase/transforms/init.clj b/src/metabase/transforms/init.clj
index 4331e67adbe..ec8bccacf86 100644
--- a/src/metabase/transforms/init.clj
+++ b/src/metabase/transforms/init.clj
@@ -1,15 +1,15 @@
(ns metabase.transforms.init
(:require
- [metabase.models.transforms.job-run]
- [metabase.models.transforms.transform]
- [metabase.models.transforms.transform-job]
- [metabase.models.transforms.transform-job-transform-tag]
- [metabase.models.transforms.transform-run]
- [metabase.models.transforms.transform-run-cancelation]
- [metabase.models.transforms.transform-tag]
- [metabase.models.transforms.transform-transform-tag]
[metabase.transforms.canceling]
[metabase.transforms.jobs]
+ [metabase.transforms.models.job-run]
+ [metabase.transforms.models.transform]
+ [metabase.transforms.models.transform-job]
+ [metabase.transforms.models.transform-job-transform-tag]
+ [metabase.transforms.models.transform-run]
+ [metabase.transforms.models.transform-run-cancelation]
+ [metabase.transforms.models.transform-tag]
+ [metabase.transforms.models.transform-transform-tag]
[metabase.transforms.query-impl]
[metabase.transforms.schedule]
[metabase.transforms.settings]
diff --git a/src/metabase/transforms/jobs.clj b/src/metabase/transforms/jobs.clj
index d60711dc300..e0fd59ce938 100644
--- a/src/metabase/transforms/jobs.clj
+++ b/src/metabase/transforms/jobs.clj
@@ -7,14 +7,14 @@
[flatland.ordered.set :as ordered-set]
[metabase.channel.urls :as urls]
[metabase.events.core :as events]
- [metabase.models.transforms.job-run :as transforms.job-run]
- [metabase.models.transforms.transform-run :as transform-run]
[metabase.revisions.core :as revisions]
[metabase.task.core :as task]
[metabase.tracing.core :as tracing]
[metabase.transforms-base.ordering :as transforms-base.ordering]
[metabase.transforms.execute :as transforms.execute]
[metabase.transforms.instrumentation :as transforms.instrumentation]
+ [metabase.transforms.models.job-run :as transforms.job-run]
+ [metabase.transforms.models.transform-run :as transform-run]
[metabase.transforms.settings :as transforms.settings]
[metabase.transforms.util :as transforms.u]
[metabase.util :as u]
diff --git a/src/metabase/models/transforms/job_run.clj b/src/metabase/transforms/models/job_run.clj
similarity index 99%
rename from src/metabase/models/transforms/job_run.clj
rename to src/metabase/transforms/models/job_run.clj
index 507f6062a42..66b3685a97a 100644
--- a/src/metabase/models/transforms/job_run.clj
+++ b/src/metabase/transforms/models/job_run.clj
@@ -1,4 +1,4 @@
-(ns metabase.models.transforms.job-run
+(ns metabase.transforms.models.job-run
(:require
[metabase.app-db.core :as mdb]
[metabase.models.interface :as mi]
diff --git a/src/metabase/models/transforms/transform.clj b/src/metabase/transforms/models/transform.clj
similarity index 99%
rename from src/metabase/models/transforms/transform.clj
rename to src/metabase/transforms/models/transform.clj
index d98a25a13f2..88fcfa8a847 100644
--- a/src/metabase/models/transforms/transform.clj
+++ b/src/metabase/transforms/models/transform.clj
@@ -1,4 +1,4 @@
-(ns metabase.models.transforms.transform
+(ns metabase.transforms.models.transform
(:require
[clojure.set :as set]
[medley.core :as m]
@@ -9,7 +9,6 @@
[metabase.lib.core :as lib]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
- [metabase.models.transforms.transform-run :as transform-run]
[metabase.permissions.core :as perms]
[metabase.remote-sync.core :as remote-sync]
[metabase.search.core :as search.core]
@@ -17,6 +16,7 @@
[metabase.search.spec :as search.spec]
[metabase.transforms-base.interface :as transforms-base.i]
[metabase.transforms-base.util :as transforms-base.u]
+ [metabase.transforms.models.transform-run :as transform-run]
[metabase.transforms.util :as transforms.u]
[metabase.util :as u]
[metabase.util.log :as log]
diff --git a/src/metabase/models/transforms/transform_job.clj b/src/metabase/transforms/models/transform_job.clj
similarity index 98%
rename from src/metabase/models/transforms/transform_job.clj
rename to src/metabase/transforms/models/transform_job.clj
index e80a20ca224..94d253be944 100644
--- a/src/metabase/models/transforms/transform_job.clj
+++ b/src/metabase/transforms/models/transform_job.clj
@@ -1,12 +1,12 @@
-(ns metabase.models.transforms.transform-job
+(ns metabase.transforms.models.transform-job
(:require
[clojure.set :as set]
[medley.core :as m]
[metabase.api.common :as api]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
- [metabase.models.transforms.job-run :as transforms.job-run]
- [metabase.models.transforms.transform :as transform]
+ [metabase.transforms.models.job-run :as transforms.job-run]
+ [metabase.transforms.models.transform :as transform]
[metabase.util :as u]
[metabase.util.i18n :as i18n]
[methodical.core :as methodical]
diff --git a/src/metabase/models/transforms/transform_job_transform_tag.clj b/src/metabase/transforms/models/transform_job_transform_tag.clj
similarity index 91%
rename from src/metabase/models/transforms/transform_job_transform_tag.clj
rename to src/metabase/transforms/models/transform_job_transform_tag.clj
index f4f901b7cc5..0dfc0493490 100644
--- a/src/metabase/models/transforms/transform_job_transform_tag.clj
+++ b/src/metabase/transforms/models/transform_job_transform_tag.clj
@@ -1,4 +1,4 @@
-(ns metabase.models.transforms.transform-job-transform-tag
+(ns metabase.transforms.models.transform-job-transform-tag
(:require
[metabase.models.serialization :as serdes]
[methodical.core :as methodical]
diff --git a/src/metabase/models/transforms/transform_run.clj b/src/metabase/transforms/models/transform_run.clj
similarity index 99%
rename from src/metabase/models/transforms/transform_run.clj
rename to src/metabase/transforms/models/transform_run.clj
index 202f13635e4..865a6c053b7 100644
--- a/src/metabase/models/transforms/transform_run.clj
+++ b/src/metabase/transforms/models/transform_run.clj
@@ -1,12 +1,12 @@
-(ns metabase.models.transforms.transform-run
+(ns metabase.transforms.models.transform-run
(:require
[medley.core :as m]
[metabase.app-db.core :as mdb]
[metabase.collections.models.collection.root :as collection.root]
[metabase.events.core :as events]
[metabase.models.interface :as mi]
- [metabase.models.transforms.transform-run-cancelation :as cancel]
[metabase.query-processor.parameters.dates :as params.dates]
+ [metabase.transforms.models.transform-run-cancelation :as cancel]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
[metabase.util.honey-sql-2 :as h2x]
diff --git a/src/metabase/models/transforms/transform_run_cancelation.clj b/src/metabase/transforms/models/transform_run_cancelation.clj
similarity index 96%
rename from src/metabase/models/transforms/transform_run_cancelation.clj
rename to src/metabase/transforms/models/transform_run_cancelation.clj
index 815e5224741..eb04ccd55ac 100644
--- a/src/metabase/models/transforms/transform_run_cancelation.clj
+++ b/src/metabase/transforms/models/transform_run_cancelation.clj
@@ -1,4 +1,4 @@
-(ns metabase.models.transforms.transform-run-cancelation
+(ns metabase.transforms.models.transform-run-cancelation
(:require
[methodical.core :as methodical]
[toucan2.core :as t2]))
diff --git a/src/metabase/models/transforms/transform_tag.clj b/src/metabase/transforms/models/transform_tag.clj
similarity index 97%
rename from src/metabase/models/transforms/transform_tag.clj
rename to src/metabase/transforms/models/transform_tag.clj
index 734b4d1c09a..88dc3bdc4ed 100644
--- a/src/metabase/models/transforms/transform_tag.clj
+++ b/src/metabase/transforms/models/transform_tag.clj
@@ -1,10 +1,10 @@
-(ns metabase.models.transforms.transform-tag
+(ns metabase.transforms.models.transform-tag
(:require
[metabase.api.common :as api]
[metabase.events.core :as events]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
- [metabase.models.transforms.transform :as transform]
+ [metabase.transforms.models.transform :as transform]
[metabase.util.i18n :as i18n]
[methodical.core :as methodical]
[toucan2.core :as t2]))
diff --git a/src/metabase/models/transforms/transform_transform_tag.clj b/src/metabase/transforms/models/transform_transform_tag.clj
similarity index 92%
rename from src/metabase/models/transforms/transform_transform_tag.clj
rename to src/metabase/transforms/models/transform_transform_tag.clj
index b9ecfc383e8..61e93412c75 100644
--- a/src/metabase/models/transforms/transform_transform_tag.clj
+++ b/src/metabase/transforms/models/transform_transform_tag.clj
@@ -1,4 +1,4 @@
-(ns metabase.models.transforms.transform-transform-tag
+(ns metabase.transforms.models.transform-transform-tag
(:require
[metabase.models.serialization :as serdes]
[methodical.core :as methodical]
diff --git a/src/metabase/transforms/timeout.clj b/src/metabase/transforms/timeout.clj
index 09657ae5536..93e608b6bc9 100644
--- a/src/metabase/transforms/timeout.clj
+++ b/src/metabase/transforms/timeout.clj
@@ -3,8 +3,8 @@
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.calendar-interval :as calendar-interval]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase.models.transforms.transform-run :as transform-run]
[metabase.task.core :as task]
+ [metabase.transforms.models.transform-run :as transform-run]
[metabase.transforms.settings :as transforms.settings]
[metabase.util.log :as log]))
diff --git a/src/metabase/transforms/util.clj b/src/metabase/transforms/util.clj
index 3642e83cacc..f6db0392530 100644
--- a/src/metabase/transforms/util.clj
+++ b/src/metabase/transforms/util.clj
@@ -12,11 +12,11 @@
[metabase.driver.sql-jdbc :as sql-jdbc]
[metabase.driver.util :as driver.u]
[metabase.models.interface :as mi]
- [metabase.models.transforms.transform-run :as transform-run]
[metabase.query-processor.pipeline :as qp.pipeline]
[metabase.transforms-base.util :as transforms-base.u]
[metabase.transforms.canceling :as canceling]
[metabase.transforms.feature-gating :as transforms.gating]
+ [metabase.transforms.models.transform-run :as transform-run]
[metabase.transforms.settings :as transforms.settings]
[metabase.util :as u]
[toucan2.core :as t2])
diff --git a/src/metabase/warehouse_schema/models/field_values.clj b/src/metabase/warehouse_schema/models/field_values.clj
index 7d6c160914d..e7a52abe298 100644
--- a/src/metabase/warehouse_schema/models/field_values.clj
+++ b/src/metabase/warehouse_schema/models/field_values.clj
@@ -339,7 +339,7 @@
(defenterprise hash-input-for-database-routing
"Returns a hash input that will be used for fields subject to database routing"
- metabase-enterprise.database-routing.model
+ metabase-enterprise.database-routing.models
[_field]
nil)
diff --git a/src/metabase/warehouses/models/database.clj b/src/metabase/warehouses/models/database.clj
index 1f869b97458..aa16dfc3c2f 100644
--- a/src/metabase/warehouses/models/database.clj
+++ b/src/metabase/warehouses/models/database.clj
@@ -739,7 +739,7 @@
(defenterprise hydrate-router-user-attribute
"OSS implementation. Hydrates router user attribute on the databases."
- metabase-enterprise.database-routing.model
+ metabase-enterprise.database-routing.models
[_k databases]
(for [database databases]
(assoc database :router_user_attribute nil)))
diff --git a/test/metabase/transforms/jobs_test.clj b/test/metabase/transforms/jobs_test.clj
index 6e61f24002c..4f28da86354 100644
--- a/test/metabase/transforms/jobs_test.clj
+++ b/test/metabase/transforms/jobs_test.clj
@@ -7,14 +7,14 @@
[metabase.driver :as driver]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.models.transforms.job-run :as transforms.job-run]
- [metabase.models.transforms.transform-run :as transform-run]
[metabase.notification.seed :as notification.seed]
[metabase.query-processor.compile :as qp.compile]
[metabase.test :as mt]
[metabase.test.util.thread-local :as tu.thread-local]
[metabase.transforms.execute :as transforms.execute]
[metabase.transforms.jobs :as jobs]
+ [metabase.transforms.models.job-run :as transforms.job-run]
+ [metabase.transforms.models.transform-run :as transform-run]
[metabase.transforms.test-dataset :as transforms-dataset]
[metabase.transforms.test-util :refer [with-transform-cleanup!]]
[metabase.transforms.util :as transforms.u]
diff --git a/test/metabase/models/transforms/transform_job_test.clj b/test/metabase/transforms/models/transform_job_test.clj
similarity index 96%
rename from test/metabase/models/transforms/transform_job_test.clj
rename to test/metabase/transforms/models/transform_job_test.clj
index 752a12a9732..4de1d3e595d 100644
--- a/test/metabase/models/transforms/transform_job_test.clj
+++ b/test/metabase/transforms/models/transform_job_test.clj
@@ -1,9 +1,9 @@
-(ns metabase.models.transforms.transform-job-test
+(ns metabase.transforms.models.transform-job-test
"Tests for the transform job model."
(:require
[clojure.test :refer :all]
- [metabase.models.transforms.transform-job :as transform-job]
[metabase.test :as mt]
+ [metabase.transforms.models.transform-job :as transform-job]
[metabase.util.i18n :as i18n]
[toucan2.core :as t2]))
diff --git a/test/metabase/models/transforms/transform_tag_test.clj b/test/metabase/transforms/models/transform_tag_test.clj
similarity index 89%
rename from test/metabase/models/transforms/transform_tag_test.clj
rename to test/metabase/transforms/models/transform_tag_test.clj
index 027b3275c6e..1957b1a0390 100644
--- a/test/metabase/models/transforms/transform_tag_test.clj
+++ b/test/metabase/transforms/models/transform_tag_test.clj
@@ -1,9 +1,9 @@
-(ns metabase.models.transforms.transform-tag-test
+(ns metabase.transforms.models.transform-tag-test
"Tests for the transform tag model."
(:require
[clojure.test :refer :all]
- [metabase.models.transforms.transform-tag :as transform-tag]
[metabase.test :as mt]
+ [metabase.transforms.models.transform-tag :as transform-tag]
[metabase.util.i18n :as i18n]
[toucan2.core :as t2]))
diff --git a/test/metabase/models/transforms/transform_test.clj b/test/metabase/transforms/models/transform_test.clj
similarity index 95%
rename from test/metabase/models/transforms/transform_test.clj
rename to test/metabase/transforms/models/transform_test.clj
index d256beeaf91..4db0caefc79 100644
--- a/test/metabase/models/transforms/transform_test.clj
+++ b/test/metabase/transforms/models/transform_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.models.transforms.transform-test
+(ns metabase.transforms.models.transform-test
(:require
[clojure.test :refer :all]
[metabase.test :as mt]))
diff --git a/test/metabase/transforms/models_test.clj b/test/metabase/transforms/models_test.clj
index 2312a1a352b..816aafd5ab3 100644
--- a/test/metabase/transforms/models_test.clj
+++ b/test/metabase/transforms/models_test.clj
@@ -4,12 +4,12 @@
[clojure.test :refer :all]
[metabase.collections.models.collection :as collection]
[metabase.config.core :as config]
- [metabase.models.transforms.transform :as transform.model]
- [metabase.models.transforms.transform-job :as transform-job]
- [metabase.models.transforms.transform-run :as transform-run]
- [metabase.models.transforms.transform-tag :as transform-tag]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
+ [metabase.transforms.models.transform :as transform.model]
+ [metabase.transforms.models.transform-job :as transform-job]
+ [metabase.transforms.models.transform-run :as transform-run]
+ [metabase.transforms.models.transform-tag :as transform-tag]
[metabase.util :as u]
[toucan2.core :as t2]))
diff --git a/test/metabase/transforms_rest/api/transform_job_test.clj b/test/metabase/transforms_rest/api/transform_job_test.clj
index 3ec0ff32816..c0e19d64638 100644
--- a/test/metabase/transforms_rest/api/transform_job_test.clj
+++ b/test/metabase/transforms_rest/api/transform_job_test.clj
@@ -1,9 +1,9 @@
(ns metabase.transforms-rest.api.transform-job-test
(:require
[clojure.test :refer :all]
- [metabase.models.transforms.transform-job]
- [metabase.models.transforms.transform-tag]
[metabase.test :as mt]
+ [metabase.transforms.models.transform-job]
+ [metabase.transforms.models.transform-tag]
[metabase.transforms.schedule :as transforms.schedule]
[metabase.transforms.test-util :refer [parse-instant
utc-timestamp]]
diff --git a/test/metabase/transforms_rest/api/transform_tag_test.clj b/test/metabase/transforms_rest/api/transform_tag_test.clj
index 2645adf72ea..235d6fcd09e 100644
--- a/test/metabase/transforms_rest/api/transform_tag_test.clj
+++ b/test/metabase/transforms_rest/api/transform_tag_test.clj
@@ -2,9 +2,9 @@
"Tests for transform tag CRUD API endpoints."
(:require
[clojure.test :refer :all]
- [metabase.models.transforms.transform-tag]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
+ [metabase.transforms.models.transform-tag]
[metabase.util :as u]
[toucan2.core :as t2]))
diff --git a/test/metabase/transforms_rest/api/transform_test.clj b/test/metabase/transforms_rest/api/transform_test.clj
index 7daf824832f..45ccba08554 100644
--- a/test/metabase/transforms_rest/api/transform_test.clj
+++ b/test/metabase/transforms_rest/api/transform_test.clj
@@ -5,7 +5,6 @@
[medley.core :as m]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
- [metabase.models.transforms.transform :as transform.model]
[metabase.permissions.core :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
[metabase.query-processor.test :as qp]
@@ -13,6 +12,7 @@
[metabase.test :as mt]
[metabase.transforms-base.util :as transforms-base.u]
[metabase.transforms-rest.api.transform]
+ [metabase.transforms.models.transform :as transform.model]
[metabase.transforms.query-test-util :as query-test-util]
[metabase.transforms.test-dataset :as transforms-dataset]
[metabase.transforms.test-util :refer [get-test-schema