diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index 1f0f72eb32c5085ac7327b817247a6727e71abc6..0febc00bf54e8618190634b0ad84b74313794ad9 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -123,22 +123,27 @@
schema.core/either {:namespaces ["metabase.*"]}}}
:discouraged-var
- {clojure.core/print {:message "Use clojure.tools.logging instead of clojure.core/print"}
- clojure.core/println {:message "Use clojure.tools.logging instead of clojure.core/println"}
- clojure.core/printf {:message "Use clojure.tools.logging instead of clojure.core/printf"}
- clojure.core/prn {:message "Use clojure.tools.logging instead of clojure.core/prn"}
- clojure.core/pr {:message "Use clojure.tools.logging instead of clojure.core/pr"}
- clojure.pprint/pprint {:message "Use clojure.tools.logging instead of clojure.pprint/pprint"}
- clojure.string/lower-case {:message "Use metabase.util/lower-case-en instead of clojure.string/lower-case"}
- clojure.string/upper-case {:message "Use metabase.util/upper-case-en instead of clojure.string/upper-case"}
- honeysql.core/call {:message "Use hx/call instead because it is Honey SQL 2 friendly"}
- honeysql.core/raw {:message "Use hx/raw instead because it is Honey SQL 2 friendly"}
- java-time/with-clock {:message "Use mt/with-clock"}
- toucan.db/select-one-id {:message "Use toucan.db/select-one-id instead of toucan2.core/select-one-pk"}
- toucan.db/select-one {:message "Use toucan.db/select-one instead of toucan2.core/select-one"}
- toucan.db/select-one-field {:message "Use t2/select-one-fn instead of toucan.db/select-one-field"}
- toucan.db/query {:message "Use mdb.query/query instead of toucan.db/query"}
- toucan.db/reducible-query {:message "Use mdb.query/reducible-query instead of toucan.db/reducible-query"}}
+ {clojure.core/print {:message "Use clojure.tools.logging instead of clojure.core/print"}
+ clojure.core/println {:message "Use clojure.tools.logging instead of clojure.core/println"}
+ clojure.core/printf {:message "Use clojure.tools.logging instead of clojure.core/printf"}
+ clojure.core/prn {:message "Use clojure.tools.logging instead of clojure.core/prn"}
+ clojure.core/pr {:message "Use clojure.tools.logging instead of clojure.core/pr"}
+ clojure.pprint/pprint {:message "Use clojure.tools.logging instead of clojure.pprint/pprint"}
+ clojure.string/lower-case {:message "Use metabase.util/lower-case-en instead of clojure.string/lower-case"}
+ clojure.string/upper-case {:message "Use metabase.util/upper-case-en instead of clojure.string/upper-case"}
+ honeysql.core/call {:message "Use hx/call instead because it is Honey SQL 2 friendly"}
+ honeysql.core/raw {:message "Use hx/raw instead because it is Honey SQL 2 friendly"}
+ java-time/with-clock {:message "Use mt/with-clock"}
+ toucan.db/select-one {:message "Use toucan.db/select-one instead of toucan2.core/select-one"}
+ toucan.db/select-one-id {:message "Use toucan.db/select-one-id instead of toucan2.core/select-one-pk"}
+ toucan.db/select-one-field {:message "Use t2/select-one-fn instead of toucan.db/select-one-field"}
+ toucan.db/select-ids {:message "Use t2/select-pks-set instead of toucan.db/select-ids"}
+ toucan.db/select-field {:message "Use t2/select-fn instead of toucan.db/select-field"}
+ toucan.db/select-field->field {:message "Use t2/select-fn->fn instead of toucan.db/select-field->field"}
+ toucan.db/select-field->id {:message "Use t2/select-fn->pk instead of toucan.db/select-field->id"}
+ toucan.db/select-id->field {:message "Use t2/select-pk->field instead of toucan.db/select-id->field"}
+ toucan.db/query {:message "Use mdb.query/query instead of toucan.db/query"}
+ toucan.db/reducible-query {:message "Use mdb.query/reducible-query instead of toucan.db/reducible-query"}}
:discouraged-namespace
{clojure.tools.logging {:message "Use metabase.util.log instead of clojure.tools.logging directly"}
diff --git a/dev/src/dev.clj b/dev/src/dev.clj
index ece73f18147b2be463b3e842f184ab31b36918e5..92b723785ab70c1caa3868a1c9ea467fbb0addf0 100644
--- a/dev/src/dev.clj
+++ b/dev/src/dev.clj
@@ -27,6 +27,7 @@
[methodical.core :as methodical]
[potemkin :as p]
[toucan.db :as db]
+ [toucan2.core :as t2]
[toucan2.connection :as t2.connection]
[toucan2.pipeline :as t2.pipeline]))
diff --git a/enterprise/backend/src/metabase_enterprise/advanced_permissions/models/permissions/group_manager.clj b/enterprise/backend/src/metabase_enterprise/advanced_permissions/models/permissions/group_manager.clj
index ec6ed5a295234303ee962def82e2086f4cee9a0f..0a839b2ed4de63e473ce3e32a5bbf931710c500f 100644
--- a/enterprise/backend/src/metabase_enterprise/advanced_permissions/models/permissions/group_manager.clj
+++ b/enterprise/backend/src/metabase_enterprise/advanced_permissions/models/permissions/group_manager.clj
@@ -6,7 +6,8 @@
[metabase.models :refer [PermissionsGroupMembership]]
[metabase.util :as u]
[metabase.util.i18n :refer [tru]]
- [toucan.db :as db]))
+ [toucan.db :as db]
+ [toucan2.core :as t2]))
(defn user-group-memberships
"Return a list of group memberships a User belongs to.
@@ -40,8 +41,8 @@
;; prevent groups manager from update membership of groups that they're not manager of
(when-not (and api/*is-group-manager?*
(set/subset? (set (concat to-remove-group-ids to-add-group-ids))
- (db/select-field :group_id PermissionsGroupMembership
- :user_id api/*current-user-id* :is_group_manager true)))
+ (t2/select-fn-set :group_id PermissionsGroupMembership
+ :user_id api/*current-user-id* :is_group_manager true)))
(throw (ex-info (tru "Not allowed to edit group memberships")
{:status-code 403}))))
(db/transaction
diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/api/user.clj b/enterprise/backend/src/metabase_enterprise/sandbox/api/user.clj
index 8df8cf18f24fbb3348434985aa95a79d9e24c108..fa6d6a023c0f5c4b4dce8435f8bdcf5c122de4f8 100644
--- a/enterprise/backend/src/metabase_enterprise/sandbox/api/user.clj
+++ b/enterprise/backend/src/metabase_enterprise/sandbox/api/user.clj
@@ -34,7 +34,7 @@
[]
(->>
;; look at the `login_attributes` for the first 1000 users that have them set. Then make a set of the keys
- (for [login-attributes (db/select-field :login_attributes User :login_attributes [:not= nil] {:limit 1000})
+ (for [login-attributes (t2/select-fn-set :login_attributes User :login_attributes [:not= nil] {:limit 1000})
:when (seq login-attributes)]
(set (keys login-attributes)))
;; combine all the sets of attribute keys into a single set
diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/api/util.clj b/enterprise/backend/src/metabase_enterprise/sandbox/api/util.clj
index 4d5111318906a8f3416df4fbe72f3f1c22b01a38..4ce8b08d405a3ef78b17a8d61bc3659e97414f3f 100644
--- a/enterprise/backend/src/metabase_enterprise/sandbox/api/util.clj
+++ b/enterprise/backend/src/metabase_enterprise/sandbox/api/util.clj
@@ -9,7 +9,8 @@
[metabase.models.permissions-group-membership
:refer [PermissionsGroupMembership]]
[metabase.util.i18n :refer [tru]]
- [toucan.db :as db]))
+ [toucan.db :as db]
+ [toucan2.core :as t2]))
(defn- enforce-sandbox?
"Takes the permission set for each group a user is in, and a sandbox, and determines whether the sandbox should be
@@ -41,10 +42,10 @@
(boolean
(when-not *is-superuser?*
(if *current-user-id*
- (let [group-ids (db/select-field :group_id PermissionsGroupMembership :user_id *current-user-id*)
+ (let [group-ids (t2/select-fn-set :group_id PermissionsGroupMembership :user_id *current-user-id*)
sandboxes (when (seq group-ids)
(db/select GroupTableAccessPolicy :group_id [:in group-ids]))]
- (seq (enforced-sandboxes sandboxes group-ids)))
+ (seq (enforced-sandboxes sandboxes group-ids)))
;; If no *current-user-id* is bound we can't check for sandboxes, so we should throw in this case to avoid
;; returning `false` for users who should actually be sandboxes.
(throw (ex-info (str (tru "No current user found"))
diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/models/params/field_values.clj b/enterprise/backend/src/metabase_enterprise/sandbox/models/params/field_values.clj
index 023bd13954ac5fc3010027c9e5ff82e565a0d3bf..6b3229916dee45bab7ea0c70f89fb8cf90bc6cdb 100644
--- a/enterprise/backend/src/metabase_enterprise/sandbox/models/params/field_values.clj
+++ b/enterprise/backend/src/metabase_enterprise/sandbox/models/params/field_values.clj
@@ -27,7 +27,7 @@
(defn- table-id->gtap
"Find the GTAP for current user that apply to table `table-id`."
[table-id]
- (let [group-ids (db/select-field :group_id PermissionsGroupMembership :user_id api/*current-user-id*)
+ (let [group-ids (t2/select-fn-set :group_id PermissionsGroupMembership :user_id api/*current-user-id*)
gtaps (db/select GroupTableAccessPolicy
:group_id [:in group-ids]
:table_id table-id)]
@@ -61,7 +61,7 @@
(when-let [gtap (table-id->gtap table_id)]
(let [login-attributes (:login_attributes @api/*current-user*)
attribute_remappings (:attribute_remappings gtap)
- field-ids (db/select-field :id Field :table_id table_id)]
+ field-ids (t2/select-fn-set :id Field :table_id table_id)]
[(:card_id gtap)
(-> gtap :card :updated_at)
(if (= :native (get-in gtap [:card :query_type]))
diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/query_processor/middleware/row_level_restrictions.clj b/enterprise/backend/src/metabase_enterprise/sandbox/query_processor/middleware/row_level_restrictions.clj
index 7e7599df7a145a7529c8cfadc5028d203b5fe56f..935c7574d01af40576daf79649807e66de525e83 100644
--- a/enterprise/backend/src/metabase_enterprise/sandbox/query_processor/middleware/row_level_restrictions.clj
+++ b/enterprise/backend/src/metabase_enterprise/sandbox/query_processor/middleware/row_level_restrictions.clj
@@ -73,7 +73,7 @@
(defn- tables->sandboxes [table-ids]
(qp.store/cached [*current-user-id* table-ids]
(let [group-ids (qp.store/cached *current-user-id*
- (db/select-field :group_id PermissionsGroupMembership :user_id *current-user-id*))
+ (t2/select-fn-set :group_id PermissionsGroupMembership :user_id *current-user-id*))
sandboxes (when (seq group-ids)
(db/select GroupTableAccessPolicy :group_id [:in group-ids]
:table_id [:in table-ids]))
diff --git a/enterprise/backend/src/metabase_enterprise/serialization/api/serialize.clj b/enterprise/backend/src/metabase_enterprise/serialization/api/serialize.clj
index 0b6ab5f31e5df369ead72e9bb18a074089d0dfe4..dd2a5034d72c1b2f54dbd08d089cd23b49b2e775 100644
--- a/enterprise/backend/src/metabase_enterprise/serialization/api/serialize.clj
+++ b/enterprise/backend/src/metabase_enterprise/serialization/api/serialize.clj
@@ -8,7 +8,7 @@
[metabase.models.collection :refer [Collection]]
[metabase.util.i18n :refer [tru]]
[metabase.util.schema :as su]
- [toucan.db :as db]))
+ [toucan2.core :as t2]))
#_{:clj-kondo/ignore [:deprecated-var]}
(api/defendpoint-schema POST "/data-model"
@@ -29,7 +29,7 @@
path (su/with-api-error-message su/NonBlankString
"Valid directory to serialize results to")}
;; Make sure all the specified collection IDs exist.
- (let [existing-collection-ids (db/select-ids Collection :id [:in (set collection_ids)])]
+ (let [existing-collection-ids (t2/select-pks-set Collection :id [:in (set collection_ids)])]
(when-not (= (set collection_ids) (set existing-collection-ids))
(throw (ex-info (tru "Invalid Collection ID(s). These Collections do not exist: {0}"
(pr-str (set/difference (set collection_ids) (set existing-collection-ids))))
diff --git a/enterprise/backend/src/metabase_enterprise/serialization/v2/extract.clj b/enterprise/backend/src/metabase_enterprise/serialization/v2/extract.clj
index 1609175ba58bf12e5c6c453ecaae8ccdf92d0e2e..901d6e66662a77e7fd1d982d80af10b607740ae2 100644
--- a/enterprise/backend/src/metabase_enterprise/serialization/v2/extract.clj
+++ b/enterprise/backend/src/metabase_enterprise/serialization/v2/extract.clj
@@ -90,7 +90,7 @@
dashboards (db/select Dashboard :collection_id [:in collection-set])
;; All cards that are in this collection set.
cards (reduce set/union (for [coll-id collection-set]
- (db/select-ids Card :collection_id coll-id)))
+ (t2/select-pks-set Card :collection_id coll-id)))
;; Map of {dashboard-id #{DashboardCard}} for dashcards whose cards OR parameter-bound cards are outside the
;; transitive collection set.
diff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/group_manager_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/group_manager_test.clj
index d6850ea26144973859e55925eae0f2c386d06e10..097b841fa7d24470a272e36550fec87d53c327ba 100644
--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/group_manager_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/group_manager_test.clj
@@ -81,7 +81,7 @@
(delete-group user 204 true)
(testing "admins could view all groups"
- (is (= (db/select-field :name PermissionsGroup)
+ (is (= (t2/select-fn-set :name PermissionsGroup)
(set (map :name (get-groups :crowberto 200)))))))))))))
(deftest memebership-apis-test
@@ -213,7 +213,7 @@
:is_group_manager true})))))
(testing "Admin can could view all groups"
- (is (= (db/select-field :id PermissionsGroup)
+ (is (= (t2/select-fn-set :id PermissionsGroup)
(membership->groups-ids (get-membership :crowberto 200))))))))))))
(deftest get-users-api-test
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 38c120126d54500a2aa4833ac665c66a4bd33294..e09fd9fdffac80295adc88488c05cefbd3cd4592 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
@@ -13,7 +13,8 @@
[metabase.test :as mt]
[metabase.util :as u]
[schema.core :as s]
- [toucan.db :as db]))
+ [toucan.db :as db]
+ [toucan2.core :as t2]))
;;;; Graph-related stuff
@@ -107,11 +108,11 @@
(is (= {:schemas :block}
(test-db-perms group-id)))
(is (= #{(perms/database-block-perms-path (mt/id))}
- (db/select-field :object Permissions {:where [:and
- [:or
- [:like :object "/block/%"]
- [:like :object "/db/%"]]
- [:= :group_id group-id]]}))))))))))
+ (t2/select-fn-set :object Permissions {:where [:and
+ [:or
+ [:like :object "/block/%"]
+ [:like :object "/db/%"]]
+ [:= :group_id group-id]]}))))))))))
(deftest update-graph-delete-sandboxes-test
(testing "When setting `:block` permissions any GTAP rows for that Group/Database should get deleted."
diff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions_test.clj
index 04a44881aa2b50147e74024e80f1b384e5b181f5..d89833d0eeeb8594ce022bb73d7fe6c620b4ebcb 100644
--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/permissions_test.clj
@@ -11,7 +11,7 @@
[metabase.sync.sync-metadata.tables :as sync-tables]
[metabase.test :as mt]
[metabase.util :as u]
- [toucan.db :as db]))
+ [toucan2.core :as t2]))
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | Download permissions |
@@ -135,7 +135,7 @@
(testing "If a group has granular download perms for a DB, native download perms are removed when a new table is
found during sync, since the new table has no download perms"
- (let [table-ids (db/select-ids 'Table :db_id db-id)
+ (let [table-ids (t2/select-pks-set 'Table :db_id db-id)
limited-downloads-id (apply min table-ids)
graph {:schemas {"PUBLIC"
(-> (into {} (for [id table-ids] [id :full]))
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/load_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/load_test.clj
index 895d0deee367c3f4026d6777dba0fb2f513f6926..253539630dab4cc9305d0a75ffd7812ee9eb643f 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/load_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/load_test.clj
@@ -58,7 +58,7 @@
(into {} (for [model [Database Table Field Metric Segment Collection Dashboard DashboardCard Pulse
Card DashboardCardSeries FieldValues Dimension PulseCard PulseChannel User
NativeQuerySnippet]]
- [model (db/select-field :id model)])))
+ [model (t2/select-fn-set :id model)])))
(defmacro with-world-cleanup
[& body]
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/backfill_ids_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/backfill_ids_test.clj
index 284a8002f94fba970cbda83de823f4c8f9a40126..f63eb127c66ac98451762b613b4c6c82af9d38c9 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/backfill_ids_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/backfill_ids_test.clj
@@ -19,7 +19,7 @@
:location (str "/" c2-id "/")}]]
(let [coll-ids [c1-id c2-id c3-id c4-id]
- all-eids #(db/select-field :entity_id Collection :id [:in coll-ids])]
+ all-eids #(t2/select-fn-set :entity_id Collection :id [:in coll-ids])]
(testing "all collections have entity_ids"
(is (every? some? (all-eids))))
@@ -39,7 +39,7 @@
(testing "deleting the entity_id for one of them"
(db/update! Collection c2-id {:entity_id nil})
(is (= #{c1-eid nil}
- (db/select-field :entity_id Collection))))
+ (t2/select-fn-set :entity_id Collection))))
(testing "backfill"
(serdes.backfill/backfill-ids-for Collection)
@@ -55,14 +55,14 @@
(testing "deleting the entity_id for one of them"
(db/update! Collection c2-id {:entity_id nil})
(is (= #{c1-eid nil}
- (db/select-field :entity_id Collection))))
+ (t2/select-fn-set :entity_id Collection))))
(testing "backfilling twice"
(serdes.backfill/backfill-ids-for Collection)
(let [first-eid (t2/select-one-fn :entity_id Collection :id c2-id)]
(db/update! Collection c2-id {:entity_id nil})
(is (= #{c1-eid nil}
- (db/select-field :entity_id Collection)))
+ (t2/select-fn-set :entity_id Collection)))
(serdes.backfill/backfill-ids-for Collection)
(testing "produces the same entity_id both times"
(is (= first-eid (t2/select-one-fn :entity_id Collection :id c2-id)))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/e2e_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/e2e_test.clj
index 269d912e870c1033c2ef63243476dddefd20257b..e72022d925aaaf82c0b7f64bbc733546369f4998 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/e2e_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/e2e_test.clj
@@ -220,7 +220,7 @@
:pulse-channel-recipient (many-random-fks 40 {} {:pulse_channel_id [:pulse-channel 30]
:user_id [:u 100]})}))
- (is (= 100 (count (db/select-field :email 'User))))
+ (is (= 100 (count (t2/select-fn-set :email 'User))))
(testing "extraction"
(reset! extraction (into [] (extract/extract-metabase {})))
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
index 4db5a5c71db6bab644febc32a2bfa1115d4f0123..e8c3dd2d8c1920b3cf3cf17ec18ea86578e8816b 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
@@ -165,9 +165,9 @@
(is (= 3 (db/count Database)))
(is (= #{"db1" "db2" "test-data"}
- (db/select-field :name Database)))
+ (t2/select-fn-set :name Database)))
(is (= #{(:id @db1d) (:id @db2d)}
- (db/select-field :db_id Table :name "posts")))
+ (t2/select-fn-set :db_id Table :name "posts")))
(is (db/exists? Table :name "posts" :db_id (:id @db1d)))
(is (db/exists? Table :name "posts" :db_id (:id @db2d)))))))))
@@ -837,7 +837,7 @@
(is (not= (:id @field2s) (:id @field2d))))
(testing "there are 2 FieldValues defined under fields of table1d"
- (let [fields (db/select-ids Field :table_id (:id @table1d))]
+ (let [fields (t2/select-pks-set Field :table_id (:id @table1d))]
(is (= 2 (db/count FieldValues :field_id [:in fields])))))
(testing "existing FieldValues are properly found and updated"
diff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj
index 305289f59d3922cc7e39096c924dbff766561ba6..93eb47ba5413aefa1593f0f0b5fa155ce881c3fe 100644
--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj
@@ -245,8 +245,8 @@
(#'mt.jwt/group-names->ids ["group_2" "group_3"])))))))
(defn- group-memberships [user-or-id]
- (when-let [group-ids (seq (db/select-field :group_id PermissionsGroupMembership :user_id (u/the-id user-or-id)))]
- (db/select-field :name PermissionsGroup :id [:in group-ids])))
+ (when-let [group-ids (seq (t2/select-fn-set :group_id PermissionsGroupMembership :user_id (u/the-id user-or-id)))]
+ (t2/select-fn-set :name PermissionsGroup :id [:in group-ids])))
(deftest login-sync-group-memberships-test
(testing "login should sync group memberships if enabled"
diff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj
index feab58ab2336be8d213995bb81a9cc44a6488bdf..ce7c0cb224c7495073f7bae96b087570675680ad 100644
--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj
@@ -485,8 +485,8 @@
(db/delete! User :%lower.email "newuser@metabase.com"))))))))
(defn- group-memberships [user-or-id]
- (when-let [group-ids (seq (db/select-field :group_id PermissionsGroupMembership :user_id (u/the-id user-or-id)))]
- (db/select-field :name PermissionsGroup :id [:in group-ids])))
+ (when-let [group-ids (seq (t2/select-fn-set :group_id PermissionsGroupMembership :user_id (u/the-id user-or-id)))]
+ (t2/select-fn-set :name PermissionsGroup :id [:in group-ids])))
(deftest login-should-sync-single-group-membership
(testing "saml group sync works when there's just a single group, which gets interpreted as a string"
diff --git a/modules/drivers/oracle/test/metabase/test/data/oracle.clj b/modules/drivers/oracle/test/metabase/test/data/oracle.clj
index cec773313ab67905b57a2d51e233e1187262fc35..3a1059ca52ba8ffc33e1bc88468bdd47c7c91ab4 100644
--- a/modules/drivers/oracle/test/metabase/test/data/oracle.clj
+++ b/modules/drivers/oracle/test/metabase/test/data/oracle.clj
@@ -139,7 +139,7 @@
(mdb/setup-db!) ; if not already setup
(when-let [existing-db (t2/select-one Database :engine "oracle", :name database-name)]
(let [existing-db-id (u/the-id existing-db)
- all-schemas (db/select-field :schema Table :db_id existing-db-id)]
+ all-schemas (t2/select-fn-set :schema Table :db_id existing-db-id)]
(when-not (= all-schemas #{session-schema})
(log/warn (u/format-color 'yellow
(str "[oracle] At least one table's schema for the existing '%s' Database"
diff --git a/modules/drivers/redshift/test/metabase/driver/redshift_test.clj b/modules/drivers/redshift/test/metabase/driver/redshift_test.clj
index 08e9eafed741d3a24e175c1eda02eb967e559eff..db316942c0a105dbfc6fe357b0341f178321b63f 100644
--- a/modules/drivers/redshift/test/metabase/driver/redshift_test.clj
+++ b/modules/drivers/redshift/test/metabase/driver/redshift_test.clj
@@ -227,7 +227,7 @@
;; sync the schema again to pick up the new view (and table, though we aren't checking that)
(sync/sync-database! database)
(is (contains?
- (db/select-field :name Table :db_id (u/the-id database)) ; the new view should have been synced
+ (t2/select-fn-set :name Table :db_id (u/the-id database)) ; the new view should have been synced
view-nm))
(let [table-id (t2/select-one-pk Table :db_id (u/the-id database), :name view-nm)]
;; and its columns' :base_type should have been identified correctly
@@ -261,7 +261,7 @@
qual-view-nm)
(sync/sync-database! database)
(is (contains?
- (db/select-field :name Table :db_id (u/the-id database)) ; the new view should have been synced without errors
+ (t2/select-fn-set :name Table :db_id (u/the-id database)) ; the new view should have been synced without errors
view-nm))
(let [table-id (t2/select-one-pk Table :db_id (u/the-id database), :name view-nm)]
;; and its columns' :base_type should have been identified correctly
diff --git a/src/metabase/api/activity.clj b/src/metabase/api/activity.clj
index ea70fcd82745c1387536dc852a8d7572cbc98821..ad7d9bef36696a6c8949af79c4b8755a42cbb589 100644
--- a/src/metabase/api/activity.clj
+++ b/src/metabase/api/activity.clj
@@ -14,7 +14,8 @@
[metabase.models.view-log :refer [ViewLog]]
[metabase.util.honey-sql-2 :as h2x]
[toucan.db :as db]
- [toucan.hydrate :refer [hydrate]]))
+ [toucan.hydrate :refer [hydrate]]
+ [toucan2.core :as t2]))
(defn- dashcard-activity? [activity]
(#{:dashboard-add-cards :dashboard-remove-cards}
@@ -43,7 +44,7 @@
[referenced-objects]
(merge
(when-let [card-ids (get referenced-objects "card")]
- (let [id->dataset? (db/select-id->field :dataset Card
+ (let [id->dataset? (t2/select-pk->fn :dataset Card
:id [:in card-ids])
{dataset-ids true card-ids' false} (group-by (comp boolean id->dataset?)
;; only existing ids go back
@@ -54,10 +55,10 @@
(into {} (for [[model ids] (dissoc referenced-objects "card")
:when (seq ids)]
[model (case model
- "dashboard" (db/select-ids 'Dashboard, :id [:in ids])
- "metric" (db/select-ids 'Metric, :id [:in ids], :archived false)
- "pulse" (db/select-ids 'Pulse, :id [:in ids])
- "segment" (db/select-ids 'Segment, :id [:in ids], :archived false)
+ "dashboard" (t2/select-pks-set 'Dashboard, :id [:in ids])
+ "metric" (t2/select-pks-set 'Metric, :id [:in ids], :archived false)
+ "pulse" (t2/select-pks-set 'Pulse, :id [:in ids])
+ "segment" (t2/select-pks-set 'Segment, :id [:in ids], :archived false)
nil)])))) ; don't care about other models
(defn- add-model-exists-info
diff --git a/src/metabase/api/collection.clj b/src/metabase/api/collection.clj
index 9e1b21433a3bf67b3ac0bedf32fe4328f0e82c6e..cc5334ce4479b030ac5878c6ee5cdaeb7a7879e4 100644
--- a/src/metabase/api/collection.clj
+++ b/src/metabase/api/collection.clj
@@ -899,7 +899,7 @@
[collection-before-update collection-updates]
(when (api/column-will-change? :archived collection-before-update collection-updates)
(when-let [alerts (seq (pulse/retrieve-alerts-for-cards
- {:card-ids (db/select-ids Card :collection_id (u/the-id collection-before-update))}))]
+ {:card-ids (t2/select-pks-set Card :collection_id (u/the-id collection-before-update))}))]
(api.card/delete-alert-and-notify-archived! alerts))))
#_{:clj-kondo/ignore [:deprecated-var]}
diff --git a/src/metabase/api/dashboard.clj b/src/metabase/api/dashboard.clj
index 8def12c8fa97e7df0452af7e04f5f5bdb549cd13..9578d3bde0afcadbb8f2ae216e0ec6faf8c39e45 100644
--- a/src/metabase/api/dashboard.clj
+++ b/src/metabase/api/dashboard.clj
@@ -182,7 +182,7 @@
another, and thus do not work as one would expect when used as map keys.)"
[hashes]
(when (seq hashes)
- (into {} (for [[k v] (db/select-field->field :query_hash :average_execution_time Query :query_hash [:in hashes])]
+ (into {} (for [[k v] (t2/select-fn->fn :query_hash :average_execution_time Query :query_hash [:in hashes])]
{(vec k) v}))))
(defn- add-query-average-duration-to-card
@@ -456,7 +456,7 @@
(remove nil?))
parameter-mappings)]
(when (seq card-ids)
- (let [card-id->query (db/select-id->field :dataset_query Card :id [:in card-ids])
+ (let [card-id->query (t2/select-pk->fn :dataset_query Card :id [:in card-ids])
field-ids (set (for [{:keys [target card-id]} parameter-mappings
:when card-id
:let [query (or (card-id->query card-id)
@@ -468,9 +468,9 @@
:when field-id]
field-id))
table-ids (when (seq field-ids)
- (db/select-field :table_id Field :id [:in field-ids]))
+ (t2/select-fn-set :table_id Field :id [:in field-ids]))
table-id->database-id (when (seq table-ids)
- (db/select-id->field :db_id Table :id [:in table-ids]))]
+ (t2/select-pk->fn :db_id Table :id [:in table-ids]))]
(doseq [table-id table-ids
:let [database-id (table-id->database-id table-id)]]
;; check whether we'd actually be able to query this Table (do we have ad-hoc data perms for it?)
@@ -515,7 +515,7 @@
[dashboard-id]
(m/map-vals (fn [mappings]
(into #{} (map #(select-keys % [:target :parameter_id])) mappings))
- (db/select-id->field :parameter_mappings DashboardCard :dashboard_id dashboard-id)))
+ (t2/select-pk->fn :parameter_mappings DashboardCard :dashboard_id dashboard-id)))
(defn- check-updated-parameter-mapping-permissions
"In 0.41.0+ you now require data permissions for the Table in question to add or modify Dashboard parameter mappings.
@@ -533,7 +533,7 @@
(assoc mapping :dashcard-id dashcard-id))
;; need to add the appropriate `:card-id` for all the new mappings we're going to check.
dashcard-id->card-id (when (seq new-mappings)
- (db/select-id->field :card_id DashboardCard
+ (t2/select-pk->fn :card_id DashboardCard
:dashboard_id dashboard-id
:id [:in (set (map :dashcard-id new-mappings))]))
new-mappings (for [{:keys [dashcard-id], :as mapping} new-mappings]
diff --git a/src/metabase/api/database.clj b/src/metabase/api/database.clj
index 2081cc1289f89e65b4952e846d37598d219b4f5a..9b9f0c77cebebfaafc2b30f7138f44445e491199 100644
--- a/src/metabase/api/database.clj
+++ b/src/metabase/api/database.clj
@@ -134,7 +134,7 @@
(some-> (driver.u/database->driver db-id) (driver/supports? :nested-queries))
(catch Throwable e
(log/error e (tru "Error determining whether Database supports nested queries")))))
- (db/select-ids Database))))
+ (t2/select-pks-set Database))))
(defn- source-query-cards
"Fetch the Cards that can be used as source queries (e.g. presented as virtual tables). Since Cards can be either
@@ -410,7 +410,7 @@
{id ms/PositiveInt}
(api/check-superuser)
(api/check-404 (db/exists? Database :id id))
- (let [table-ids (db/select-ids Table :db_id id)]
+ (let [table-ids (t2/select-pks-set Table :db_id id)]
(first (mdb.query/query
{:select [:*]
:from (for [model database-usage-models
@@ -635,7 +635,7 @@
[id]
(api/read-check Database id)
(let [fields (filter mi/can-read? (-> (db/select [Field :id :name :display_name :table_id :base_type :semantic_type]
- :table_id [:in (db/select-field :id Table, :db_id id)]
+ :table_id [:in (t2/select-fn-set :id Table, :db_id id)]
:visibility_type [:not-in ["sensitive" "retired"]])
(hydrate :table)))]
(for [{:keys [id name display_name table base_type semantic_type]} fields]
@@ -1055,11 +1055,11 @@
"Returns a list of all the schemas found for the database `id`"
[id]
(api/read-check Database id)
- (->> (db/select-field :schema Table
- :db_id id :active true
- ;; a non-nil value means Table is hidden -- see [[metabase.models.table/visibility-types]]
- :visibility_type nil
- {:order-by [[:%lower.schema :asc]]})
+ (->> (t2/select-fn-set :schema Table
+ :db_id id :active true
+ ;; a non-nil value means Table is hidden -- see [[metabase.models.table/visibility-types]]
+ :visibility_type nil
+ {:order-by [[:%lower.schema :asc]]})
(filter (partial can-read-schema? id))
;; for `nil` schemas return the empty string
(map #(if (nil? %) "" %))
@@ -1124,7 +1124,7 @@
:card
:additional-constraints [(if (= schema (api.table/root-collection-schema-name))
[:= :collection_id nil]
- [:in :collection_id (api/check-404 (not-empty (db/select-ids Collection :name schema)))])])
+ [:in :collection_id (api/check-404 (not-empty (t2/select-pks-set Collection :name schema)))])])
(map api.table/card->virtual-table))))
(api/defendpoint GET ["/:virtual-db/datasets/:schema"
@@ -1136,7 +1136,7 @@
:dataset
:additional-constraints [(if (= schema (api.table/root-collection-schema-name))
[:= :collection_id nil]
- [:in :collection_id (api/check-404 (not-empty (db/select-ids Collection :name schema)))])])
+ [:in :collection_id (api/check-404 (not-empty (t2/select-pks-set Collection :name schema)))])])
(map api.table/card->virtual-table))))
(api/defendpoint GET "/db-ids-with-deprecated-drivers"
@@ -1149,6 +1149,6 @@
(let [info (driver.u/available-drivers-info)
d (driver.u/database->driver database)]
(some? (:superseded-by (d info)))))
- (db/select-ids Database))))
+ (t2/select-pks-set Database))))
(api/define-routes)
diff --git a/src/metabase/api/metric.clj b/src/metabase/api/metric.clj
index 7ece0ccec142fbd75996bf1d4d3c21d318391e5b..c3979e314691cf009664902cb9432bd9402d8633 100644
--- a/src/metabase/api/metric.clj
+++ b/src/metabase/api/metric.clj
@@ -64,7 +64,7 @@
"Add `:database_id` fields to `metrics` by looking them up from their `:table_id`."
[metrics]
(when (seq metrics)
- (let [table-id->db-id (db/select-id->field :db_id Table, :id [:in (set (map :table_id metrics))])]
+ (let [table-id->db-id (t2/select-pk->fn :db_id Table, :id [:in (set (map :table_id metrics))])]
(for [metric metrics]
(assoc metric :database_id (table-id->db-id (:table_id metric)))))))
@@ -126,7 +126,7 @@
(api/write-check Metric id)
(api/check (<= (count important_field_ids) 3)
[400 "A Metric can have a maximum of 3 important fields."])
- (let [[fields-to-remove fields-to-add] (data/diff (set (db/select-field :field_id 'MetricImportantField :metric_id id))
+ (let [[fields-to-remove fields-to-add] (data/diff (set (t2/select-fn-set :field_id 'MetricImportantField :metric_id id))
(set important_field_ids))]
;; delete old fields as needed
diff --git a/src/metabase/api/persist.clj b/src/metabase/api/persist.clj
index a3d6de812dfddfe142a44db077cd40d699c8b3b3..5702ac6ef6533584fce7a80f617b9137bb50f048 100644
--- a/src/metabase/api/persist.clj
+++ b/src/metabase/api/persist.clj
@@ -64,7 +64,7 @@
"List the entries of [[PersistedInfo]] in order to show a status page."
[]
(validation/check-has-application-permission :monitoring)
- (let [db-ids (db/select-field :database_id PersistedInfo)
+ (let [db-ids (t2/select-fn-set :database_id PersistedInfo)
writable-db-ids (when (seq db-ids)
(->> (db/select Database :id [:in db-ids])
(filter mi/can-write?)
diff --git a/src/metabase/api/table.clj b/src/metabase/api/table.clj
index 951b7721b976d3ba2d1ef019dcd3b253f262e3d9..34555c3665234d429b5b85e6708523b0be461f91 100644
--- a/src/metabase/api/table.clj
+++ b/src/metabase/api/table.clj
@@ -414,7 +414,7 @@
[id]
{id ms/PositiveInt}
(api/read-check Table id)
- (when-let [field-ids (seq (db/select-ids Field, :table_id id, :visibility_type [:not= "retired"], :active true))]
+ (when-let [field-ids (seq (t2/select-pks-set Field, :table_id id, :visibility_type [:not= "retired"], :active true))]
(for [origin-field (db/select Field, :fk_target_field_id [:in field-ids], :active true)]
;; it's silly to be hydrating some of these tables/dbs
{:relationship :Mt1
@@ -445,7 +445,7 @@
[id]
{id ms/PositiveInt}
(api/write-check (t2/select-one Table :id id))
- (when-let [field-ids (db/select-ids Field :table_id id)]
+ (when-let [field-ids (t2/select-pks-set Field :table_id id)]
(db/simple-delete! FieldValues :field_id [:in field-ids]))
{:status :success})
diff --git a/src/metabase/cmd/rotate_encryption_key.clj b/src/metabase/cmd/rotate_encryption_key.clj
index 268e52e521ea54714dc7f0fe671e177c32a4abee..a90cded0ff358a5e09e3524072c4fa367e05bfad 100644
--- a/src/metabase/cmd/rotate_encryption_key.clj
+++ b/src/metabase/cmd/rotate_encryption_key.clj
@@ -10,7 +10,6 @@
[metabase.util.encryption :as encryption]
[metabase.util.i18n :refer [trs]]
[metabase.util.log :as log]
- [toucan.db :as db]
[toucan2.core :as t2]))
(defn rotate-encryption-key!
@@ -34,14 +33,14 @@
"setting.\"KEY\" = ?"
"setting.key = ?")]
(t2/with-transaction [t-conn {:datasource (mdb.connection/data-source)}]
- (doseq [[id details] (db/select-id->field :details Database)]
+ (doseq [[id details] (t2/select-pk->fn :details Database)]
(when (encryption/possibly-encrypted-string? details)
(throw (ex-info (trs "Can''t decrypt app db with MB_ENCRYPTION_SECRET_KEY") {:database-id id})))
(jdbc/update! {:connection t-conn}
:metabase_database
{:details (encrypt-str-fn (json/encode details))}
["metabase_database.id = ?" id]))
- (doseq [[key value] (db/select-field->field :key :value Setting)]
+ (doseq [[key value] (t2/select-fn->fn :key :value Setting)]
(if (= key "settings-last-updated")
(setting.cache/update-settings-last-updated!)
(jdbc/update! {:connection t-conn}
@@ -52,7 +51,7 @@
;; fortunately, we don't need to fetch the latest secret instance per ID, as we would need to in order to update
;; a secret value through the regular database save API path; instead, ALL secret values in the app DB (regardless
;; of whether they are the "current version" or not), should be updated with the new key
- (doseq [[id value] (db/select-id->field :value Secret)]
+ (doseq [[id value] (t2/select-pk->fn :value Secret)]
(when (encryption/possibly-encrypted-string? value)
(throw (ex-info (trs "Can''t decrypt secret value with MB_ENCRYPTION_SECRET_KEY") {:secret-id id})))
(jdbc/update! {:connection t-conn}
diff --git a/src/metabase/db/data_migrations.clj b/src/metabase/db/data_migrations.clj
index d0c0c2bc5484149246d0cd689c5c51c0c21e4a51..e35385de4d2b2302e0fe61f83f34e7fd612c48f0 100644
--- a/src/metabase/db/data_migrations.clj
+++ b/src/metabase/db/data_migrations.clj
@@ -63,7 +63,7 @@
"Run all data migrations defined by `defmigration`."
[]
(log/info "Running all necessary data migrations, this may take a minute.")
- (let [ran-migrations (db/select-ids DataMigrations)]
+ (let [ran-migrations (t2/select-pks-set DataMigrations)]
(doseq [migration @data-migrations]
(run-migration-if-needed! ran-migrations migration)))
(log/info "Finished running data migrations."))
diff --git a/src/metabase/db/util.clj b/src/metabase/db/util.clj
index bc67f9f032dc3c6d8a08923781913d2488c3914d..c6719ff27175b12948be59b0dfe0bad95f321d42 100644
--- a/src/metabase/db/util.clj
+++ b/src/metabase/db/util.clj
@@ -10,7 +10,7 @@
(defn join
"Convenience for generating a HoneySQL `JOIN` clause.
- (db/select-ids FieldValues
+ (t2/select-pks-set FieldValues
(mdb/join [FieldValues :field_id] [Field :id])
:active true)"
[[source-entity fk] [dest-entity pk]]
diff --git a/src/metabase/driver/sql_jdbc/actions.clj b/src/metabase/driver/sql_jdbc/actions.clj
index d5dcc91a65a9af2d706b9e92a74c11dae29d78ae..6fbbe4fbeaec4980a4a06fb4e91b3195a280fd98 100644
--- a/src/metabase/driver/sql_jdbc/actions.clj
+++ b/src/metabase/driver/sql_jdbc/actions.clj
@@ -21,7 +21,8 @@
[metabase.util.i18n :refer [trs tru]]
[metabase.util.log :as log]
[schema.core :as s]
- [toucan.db :as db])
+ [toucan.db :as db]
+ [toucan2.core :as t2])
(:import
(java.sql Connection PreparedStatement)))
@@ -387,7 +388,7 @@
(defn- table-id->pk-field-name->id
"Given a `table-id` return a map of string Field name -> Field ID for the primary key columns for that Table."
[table-id]
- (db/select-field->id :name Field
+ (t2/select-fn->pk :name Field
{:where [:and
[:= :table_id table-id]
(mdb.u/isa :semantic_type :type/PK)]}))
diff --git a/src/metabase/email/messages.clj b/src/metabase/email/messages.clj
index 31b22566373a64ea2491ebdf317cb09ea6e6fee8..7f8aaa2c432a3f9aaa4195b4e4f30ad2a91b9373 100644
--- a/src/metabase/email/messages.clj
+++ b/src/metabase/email/messages.clj
@@ -36,7 +36,6 @@
[metabase.util.urls :as urls]
[stencil.core :as stencil]
[stencil.loader :as stencil-loader]
- [toucan.db :as db]
[toucan2.core :as t2])
(:import
(java.io File IOException OutputStream)
@@ -138,7 +137,7 @@
[]
(concat (when-let [admin-email (public-settings/admin-email)]
[admin-email])
- (db/select-field :email 'User, :is_superuser true, :is_active true, {:order-by [[:id :asc]]})))
+ (t2/select-fn-set :email 'User, :is_superuser true, :is_active true, {:order-by [[:id :asc]]})))
(defn send-user-joined-admin-notification-email!
"Send an email to the `invitor` (the Admin who invited `new-user`) letting them know `new-user` has joined."
@@ -236,9 +235,9 @@
(concat
(all-admin-recipients)
(when (seq user-ids)
- (db/select-field :email User {:where [:and
- [:= :is_active true]
- [:in :id user-ids]]}))))))
+ (t2/select-fn-set :email User {:where [:and
+ [:= :is_active true]
+ [:in :id user-ids]]}))))))
(defn send-persistent-model-error-email!
"Format and send an email informing the user about errors in the persistent model refresh task."
diff --git a/src/metabase/integrations/common.clj b/src/metabase/integrations/common.clj
index 63507aed10a6d4d4a2e832928406fe5c5ad7d49b..827e7527b8780df696807cff963f8f675d59962b 100644
--- a/src/metabase/integrations/common.clj
+++ b/src/metabase/integrations/common.clj
@@ -10,7 +10,8 @@
[metabase.util :as u]
[metabase.util.i18n :refer [trs]]
[metabase.util.log :as log]
- [toucan.db :as db]))
+ [toucan.db :as db]
+ [toucan2.core :as t2]))
(defn sync-group-memberships!
"Update the PermissionsGroups a User belongs to, adding or deleting membership entries as needed so that Users is
@@ -20,10 +21,10 @@
excluded-group-ids #{(u/the-id (perms-group/all-users))}
user-id (u/the-id user-or-id)
current-group-ids (when (seq mapped-group-ids)
- (db/select-field :group_id PermissionsGroupMembership
- :user_id user-id
- :group_id [:in mapped-group-ids]
- :group_id [:not-in excluded-group-ids]))
+ (t2/select-fn-set :group_id PermissionsGroupMembership
+ :user_id user-id
+ :group_id [:in mapped-group-ids]
+ :group_id [:not-in excluded-group-ids]))
new-group-ids (set/intersection (set (map u/the-id new-groups-or-ids))
mapped-group-ids)
;; determine what's different between current mapped groups and new mapped groups
diff --git a/src/metabase/models/card.clj b/src/metabase/models/card.clj
index 7f52388f068a67cdcaa48a40c474a507a96a92a5..6b6606aad7ad404a16e65ff8df2fb478c2190fee 100644
--- a/src/metabase/models/card.clj
+++ b/src/metabase/models/card.clj
@@ -329,7 +329,7 @@
(defn- disable-implicit-action-for-model!
"Delete all implicit actions of a model if exists."
[model-id]
- (when-let [action-ids (t2/select-pks-set 'Action {:select [:action.id]
+ (when-let [action-ids (t2/select-pks-set 'Action {:select [:action.id]
:from [:action]
:join [:implicit_action
[:= :action.id :implicit_action.action_id]]
diff --git a/src/metabase/models/collection.clj b/src/metabase/models/collection.clj
index f42c07afbcf3081792ba6909388086622732887f..29a87a74729610f117f8c36fc868d8a2b14ea758 100644
--- a/src/metabase/models/collection.clj
+++ b/src/metabase/models/collection.clj
@@ -473,7 +473,7 @@
(s/defn descendant-ids :- (s/maybe #{su/IntGreaterThanZero})
"Return a set of IDs of all descendant Collections of a `collection`."
[collection :- CollectionWithLocationAndIDOrRoot]
- (db/select-ids Collection :location [:like (str (children-location collection) \%)]))
+ (t2/select-pks-set Collection :location [:like (str (children-location collection) \%)]))
(s/defn ^:private effective-children-where-clause
[collection & additional-honeysql-where-clauses]
@@ -564,7 +564,7 @@
(parent collection)
(cons
collection
- (db/select-ids Collection :location [:like (str (children-location collection) "%")])))]
+ (t2/select-pks-set Collection :location [:like (str (children-location collection) "%")])))]
(perms/collection-readwrite-path collection-or-id))))
(s/defn perms-for-moving :- #{perms/PathSchema}
@@ -616,7 +616,7 @@
(s/defn ^:private collection->descendant-ids :- (s/maybe #{su/IntGreaterThanZero})
[collection :- CollectionWithLocationAndIDOrRoot, & additional-conditions]
- (apply db/select-ids Collection
+ (apply t2/select-pks-set Collection
:location [:like (str (children-location collection) "%")]
additional-conditions))
@@ -687,10 +687,10 @@
and write perms for every Group with write perms for the source Collection."
[source-collection-or-id dest-collections-or-ids]
;; figure out who has permissions for the source Collection...
- (let [group-ids-with-read-perms (db/select-field :group_id Permissions
- :object (perms/collection-read-path source-collection-or-id))
- group-ids-with-write-perms (db/select-field :group_id Permissions
- :object (perms/collection-readwrite-path source-collection-or-id))]
+ (let [group-ids-with-read-perms (t2/select-fn-set :group_id Permissions
+ :object (perms/collection-read-path source-collection-or-id))
+ group-ids-with-write-perms (t2/select-fn-set :group_id Permissions
+ :object (perms/collection-readwrite-path source-collection-or-id))]
;; ...and insert corresponding rows for each destination Collection
(db/insert-many! Permissions
(concat
@@ -984,11 +984,11 @@
(defmethod serdes/descendants "Collection" [_model-name id]
(let [location (t2/select-one-fn :location Collection :id id)
- child-colls (set (for [child-id (db/select-ids Collection {:where [:like :location (str location id "/%")]})]
+ child-colls (set (for [child-id (t2/select-pks-set Collection {:where [:like :location (str location id "/%")]})]
["Collection" child-id]))
- dashboards (set (for [dash-id (db/select-ids 'Dashboard :collection_id id)]
+ dashboards (set (for [dash-id (t2/select-pks-set 'Dashboard :collection_id id)]
["Dashboard" dash-id]))
- cards (set (for [card-id (db/select-ids 'Card :collection_id id)]
+ cards (set (for [card-id (t2/select-pks-set 'Card :collection_id id)]
["Card" card-id]))]
(set/union child-colls dashboards cards)))
@@ -1135,7 +1135,7 @@
[users]
(when (seq users)
;; efficiently create a map of user ID -> personal collection ID
- (let [user-id->collection-id (db/select-field->id :personal_owner_id Collection
+ (let [user-id->collection-id (t2/select-fn->pk :personal_owner_id Collection
:personal_owner_id [:in (set (map u/the-id users))])]
(assert (map? user-id->collection-id))
;; now for each User, try to find the corresponding ID out of that map. If it's not present (the personal
diff --git a/src/metabase/models/collection/graph.clj b/src/metabase/models/collection/graph.clj
index ea039b1c04aabda733723d29ee1354e8c1eeffe0..df6105b4a46f7b8b216ca32026a3eb7d415b4a3b 100644
--- a/src/metabase/models/collection/graph.clj
+++ b/src/metabase/models/collection/graph.clj
@@ -14,7 +14,8 @@
[metabase.util.honey-sql-2 :as h2x]
[metabase.util.schema :as su]
[schema.core :as s]
- [toucan.db :as db]))
+ [toucan.db :as db]
+ [toucan2.core :as t2]))
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | PERMISSIONS GRAPH |
@@ -60,7 +61,7 @@
"Return a set of IDs of all Collections that are neither Personal Collections nor descendants of Personal
Collections (i.e., things that you can set Permissions for, and that should go in the graph.)"
[collection-namespace :- (s/maybe su/KeywordOrString)]
- (let [personal-collection-ids (db/select-ids Collection :personal_owner_id [:not= nil])
+ (let [personal-collection-ids (t2/select-pks-set Collection :personal_owner_id [:not= nil])
honeysql-form {:select [[:id :id]]
:from [:collection]
:where (into [:and
@@ -76,7 +77,7 @@
([collection-ids collection-namespace]
(let [group-id->perms (group-id->permissions-set)]
{:revision (c-perm-revision/latest-id)
- :groups (into {} (for [group-id (db/select-ids PermissionsGroup)]
+ :groups (into {} (for [group-id (t2/select-pks-set PermissionsGroup)]
{group-id (group-permissions-graph collection-namespace
(group-id->perms group-id)
collection-ids)}))})))
diff --git a/src/metabase/models/dashboard.clj b/src/metabase/models/dashboard.clj
index b0b25caa8227a2a98161e9a0c80d160f91acf445..9a816bfd2426fa662c11824be8895e92bbdc78b3 100644
--- a/src/metabase/models/dashboard.clj
+++ b/src/metabase/models/dashboard.clj
@@ -122,7 +122,7 @@
set)
cards-to-add (set/difference correct-card-ids stale-card-ids)
card-id->dashcard-id (when (seq cards-to-add)
- (db/select-field->id :card_id DashboardCard :dashboard_id dashboard-id
+ (t2/select-fn->pk :card_id DashboardCard :dashboard_id dashboard-id
:card_id [:in cards-to-add]))
positions-for (fn [pulse-id] (drop (pulse-card/next-position-for pulse-id)
(range)))
diff --git a/src/metabase/models/database.clj b/src/metabase/models/database.clj
index 72ba23e53472b9051430cf01d4d55f098ad3ee0f..da1bfa63e0fc6e82a9a2764e67e4152e51966bea 100644
--- a/src/metabase/models/database.clj
+++ b/src/metabase/models/database.clj
@@ -252,7 +252,7 @@
(defn pk-fields
"Return all the primary key `Fields` associated with this `database`."
[{:keys [id]}]
- (let [table-ids (db/select-ids 'Table, :db_id id, :active true)]
+ (let [table-ids (t2/select-pks-set 'Table, :db_id id, :active true)]
(when (seq table-ids)
(db/select 'Field, :table_id [:in table-ids], :semantic_type (mdb.u/isa :type/PK)))))
diff --git a/src/metabase/models/field_values.clj b/src/metabase/models/field_values.clj
index f7ff0ca9bce22419a1eee00382888da8bfaaa664..7849082ad4f1995e03bdc9e3cb6cead4eeb12746 100644
--- a/src/metabase/models/field_values.clj
+++ b/src/metabase/models/field_values.clj
@@ -421,9 +421,9 @@
[table-ids]
(let [table-ids (set table-ids)
table-id->db-id (when (seq table-ids)
- (db/select-id->field :db_id 'Table :id [:in table-ids]))
+ (t2/select-pk->fn :db_id 'Table :id [:in table-ids]))
db-id->is-on-demand? (when (seq table-id->db-id)
- (db/select-id->field :is_on_demand 'Database
+ (t2/select-pk->fn :is_on_demand 'Database
:id [:in (set (vals table-id->db-id))]))]
(into {} (for [table-id table-ids]
[table-id (-> table-id table-id->db-id db-id->is-on-demand?)]))))
diff --git a/src/metabase/models/permissions.clj b/src/metabase/models/permissions.clj
index 110af250be25e7376038f0116f59e61e1f716629..ff561c74cbb83b9e685b7d5bb327f6ac64b7afb5 100644
--- a/src/metabase/models/permissions.clj
+++ b/src/metabase/models/permissions.clj
@@ -874,7 +874,7 @@
v2 permissions
"
[]
- (let [db-ids (delay (db/select-ids 'Database))
+ (let [db-ids (delay (t2/select-pks-set 'Database))
group-id->v1-paths (->> (permissions-by-group-ids [:or
[:= :object (h2x/literal "/")]
[:like :object (h2x/literal "%/db/%")]])
@@ -901,7 +901,7 @@
|-----------------------------------|
v2 permissions"
[]
- (let [db-ids (delay (db/select-ids 'Database))
+ (let [db-ids (delay (t2/select-pks-set 'Database))
group-id->v2-paths (->> (permissions-by-group-ids [:or
[:= :object (h2x/literal "/")]
[:like :object (h2x/literal "%/db/%")]])
@@ -964,7 +964,7 @@
[:like path (h2x/concat :object (h2x/literal "%"))]
[:like :object (str path "%")]]
other-conditions)}]
- (when-let [revoked (db/select-field :object Permissions where)]
+ (when-let [revoked (t2/select-fn-set :object Permissions where)]
(log/debug (u/format-color 'red "Revoking permissions for group %d: %s" (u/the-id group-or-id) revoked))
(db/delete! Permissions where))))
@@ -1150,7 +1150,7 @@
(defn- download-permissions-set
[group-id]
- (db/select-field :object
+ (t2/select-fn-set :object
[Permissions :object]
{:where [:and
[:= :group_id group-id]
@@ -1186,7 +1186,7 @@
they are upgraded to EE."
[group-id :- su/IntGreaterThanZero db-id :- su/IntGreaterThanZero]
(let [permissions-set (download-permissions-set group-id)
- table-ids-and-schemas (db/select-id->field :schema 'Table :db_id db-id :active [:= true])
+ table-ids-and-schemas (t2/select-pk->fn :schema 'Table :db_id db-id :active [:= true])
native-perm-level (reduce (fn [lowest-seen-perm-level [table-id table-schema]]
(let [table-perm-level (download-permissions-level permissions-set
db-id
diff --git a/src/metabase/models/persisted_info.clj b/src/metabase/models/persisted_info.clj
index 4fc198bb00b90f6713d9543281b70f6cab524b0b..c14c46e245b33a13c71902781349ce87a3617c43 100644
--- a/src/metabase/models/persisted_info.clj
+++ b/src/metabase/models/persisted_info.clj
@@ -75,9 +75,9 @@
"Hydrate a card :is_persisted for the frontend."
[cards]
(when (seq cards)
- (let [existing-ids (db/select-field :card_id PersistedInfo
- :card_id [:in (map :id cards)]
- :state [:not-in ["off" "deletable"]])]
+ (let [existing-ids (t2/select-fn-set :card_id PersistedInfo
+ :card_id [:in (map :id cards)]
+ :state [:not-in ["off" "deletable"]])]
(map (fn [{id :id :as card}]
(assoc card :persisted (contains? existing-ids id)))
cards))))
diff --git a/src/metabase/models/pulse_channel.clj b/src/metabase/models/pulse_channel.clj
index 6077370b10a02814c0b54c149f44251727ace4ba..38cb7ba82d5c35669c1baddcba4d9bb6a157a57f 100644
--- a/src/metabase/models/pulse_channel.clj
+++ b/src/metabase/models/pulse_channel.clj
@@ -174,7 +174,7 @@
;; be sneaky and pass in a valid User ID but different email so they can send test Pulses out to arbitrary email
;; addresses
(when-let [user-ids (not-empty (into #{} (comp (filter some?) (map :id)) user-recipients))]
- (let [user-id->email (db/select-id->field :email User, :id [:in user-ids])]
+ (let [user-id->email (t2/select-pk->fn :email User, :id [:in user-ids])]
(doseq [{:keys [id email]} user-recipients
:let [correct-email (get user-id->email id)]]
(when-not correct-email
@@ -273,7 +273,7 @@
{:pre [(integer? id)
(coll? user-ids)
(every? integer? user-ids)]}
- (let [recipients-old (set (db/select-field :user_id PulseChannelRecipient, :pulse_channel_id id))
+ (let [recipients-old (set (t2/select-fn-set :user_id PulseChannelRecipient, :pulse_channel_id id))
recipients-new (set user-ids)
recipients+ (set/difference recipients-new recipients-old)
recipients- (set/difference recipients-old recipients-new)]
@@ -379,7 +379,7 @@
:let [id (t2/select-one-pk 'User :email email)]]
(or id
(:id (user/serdes-synthesize-user! {:email email})))))
- current-users (set (db/select-field :user_id PulseChannelRecipient :pulse_channel_id channel-id))
+ current-users (set (t2/select-fn-set :user_id PulseChannelRecipient :pulse_channel_id channel-id))
combined (set/union incoming-users current-users)]
(when-not (empty? combined)
(update-recipients! channel-id combined))))
diff --git a/src/metabase/models/query/permissions.clj b/src/metabase/models/query/permissions.clj
index bb171831cedc235d6d496dd307ea38d7ce5955f7..b322722c5ef2d2ae832d370a0f4808af4ff8790b 100644
--- a/src/metabase/models/query/permissions.clj
+++ b/src/metabase/models/query/permissions.clj
@@ -15,7 +15,6 @@
[metabase.util.log :as log]
[metabase.util.schema :as su]
[schema.core :as s]
- [toucan.db :as db]
[toucan2.core :as t2]))
;;; ---------------------------------------------- Permissions Checking ----------------------------------------------
@@ -83,7 +82,7 @@
native-perms-fn]} :- PermsOptions]
(let [table-ids (filter integer? tables-or-ids)
table-id->schema (when (seq table-ids)
- (db/select-id->field :schema Table :id [:in table-ids]))
+ (t2/select-pk->fn :schema Table :id [:in table-ids]))
table-or-id->schema #(if (integer? %)
(table-id->schema %)
(:schema %))
diff --git a/src/metabase/models/setting/cache.clj b/src/metabase/models/setting/cache.clj
index 84e7916ff5be5e03f39059de5c4af501e1db5085..85416cf86ffbf1198d0d9b52932bd1f41cef9700 100644
--- a/src/metabase/models/setting/cache.clj
+++ b/src/metabase/models/setting/cache.clj
@@ -138,7 +138,7 @@
"Populate cache with the latest hotness from the db"
[]
(log/debug (trs "Refreshing Settings cache..."))
- (reset! (cache*) (db/select-field->field :key :value 'Setting)))
+ (reset! (cache*) (t2/select-fn->fn :key :value 'Setting)))
(defonce ^:private ^ReentrantLock restore-cache-lock (ReentrantLock.))
diff --git a/src/metabase/models/table.clj b/src/metabase/models/table.clj
index f41c4b6648a91b6b77dabc325d3aea4ec16b3745..557b208c71693d7429425743aecc03dc5a1e8276 100644
--- a/src/metabase/models/table.clj
+++ b/src/metabase/models/table.clj
@@ -113,7 +113,7 @@
(defn- valid-field-order?
"Field ordering is valid if all the fields from a given table are present and only from that table."
[table field-ordering]
- (= (db/select-ids Field
+ (= (t2/select-pks-set Field
:table_id (u/the-id table)
:active true)
(set field-ordering)))
@@ -146,12 +146,12 @@
:field_values
"Return the FieldValues for all Fields belonging to a single `table`."
[{:keys [id]}]
- (let [field-ids (db/select-ids Field
+ (let [field-ids (t2/select-pks-set Field
:table_id id
:visibility_type "normal"
{:order-by field-order-rule})]
(when (seq field-ids)
- (db/select-field->field :field_id :values FieldValues, :field_id [:in field-ids]))))
+ (t2/select-fn->fn :field_id :values FieldValues, :field_id [:in field-ids]))))
(mi/define-simple-hydration-method ^{:arglists '([table])} pk-field-id
:pk_field
diff --git a/src/metabase/models/user.clj b/src/metabase/models/user.clj
index 62aafc93e1a07525314c6d48ca11c6df82ffc0f3..b5cc7154314722cb4b3b6beed1dec6e752c5b566 100644
--- a/src/metabase/models/user.clj
+++ b/src/metabase/models/user.clj
@@ -22,7 +22,8 @@
[metabase.util.schema :as su]
[schema.core :as schema]
[toucan.db :as db]
- [toucan.models :as models])
+ [toucan.models :as models]
+ [toucan2.core :as t2])
(:import
(java.util UUID)))
@@ -172,7 +173,7 @@
"Fetch set of IDs of PermissionsGroup a User belongs to."
[user-or-id]
(when user-or-id
- (db/select-field :group_id PermissionsGroupMembership :user_id (u/the-id user-or-id))))
+ (t2/select-fn-set :group_id PermissionsGroupMembership :user_id (u/the-id user-or-id))))
(def UserGroupMembership
"Group Membership info of a User.
diff --git a/src/metabase/query_processor/middleware/expand_macros.clj b/src/metabase/query_processor/middleware/expand_macros.clj
index 979e6cfdeee553b832973ffdf7c161cda7b7c3c2..666f668c55b368b85cc03f0128f9e47e53c13a9d 100644
--- a/src/metabase/query_processor/middleware/expand_macros.clj
+++ b/src/metabase/query_processor/middleware/expand_macros.clj
@@ -17,7 +17,8 @@
[metabase.util.log :as log]
[metabase.util.schema :as su]
[schema.core :as s]
- [toucan.db :as db]))
+ [toucan.db :as db]
+ [toucan2.core :as t2]))
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | SEGMENTS |
@@ -25,7 +26,7 @@
(defn- segment-clauses->id->definition [segment-clauses]
(when-let [segment-ids (seq (filter integer? (map second segment-clauses)))]
- (db/select-id->field :definition Segment, :id [:in (set segment-ids)])))
+ (t2/select-pk->fn :definition Segment, :id [:in (set segment-ids)])))
(defn- replace-segment-clauses [outer-query segment-id->definition]
(mbql.u/replace-in outer-query [:query]
diff --git a/src/metabase/related.clj b/src/metabase/related.clj
index f2278cf768981eb794d733000ce5c65fb92d5381..e01b5c437d02511a95eb5354882c5cd9d4ffda37 100644
--- a/src/metabase/related.clj
+++ b/src/metabase/related.clj
@@ -117,7 +117,7 @@
(defn- linking-to
[table]
- (->> (db/select-field :fk_target_field_id Field
+ (->> (t2/select-fn-set :fk_target_field_id Field
:table_id (:id table)
:fk_target_field_id [:not= nil]
:active true)
@@ -130,10 +130,10 @@
(defn- linked-from
[table]
- (if-let [fields (not-empty (db/select-field :id Field
- :table_id (:id table)
- :active true))]
- (->> (db/select-field :table_id Field
+ (if-let [fields (not-empty (t2/select-fn-set :id Field
+ :table_id (:id table)
+ :active true))]
+ (->> (t2/select-fn-set :table_id Field
:fk_target_field_id [:in fields]
:active true)
(map (partial t2/select-one Table :id))
@@ -143,11 +143,11 @@
(defn- cards-sharing-dashboard
[card]
- (if-let [dashboards (not-empty (db/select-field :dashboard_id DashboardCard
- :card_id (:id card)))]
- (->> (db/select-field :card_id DashboardCard
- :dashboard_id [:in dashboards]
- :card_id [:not= (:id card)])
+ (if-let [dashboards (not-empty (t2/select-fn-set :dashboard_id DashboardCard
+ :card_id (:id card)))]
+ (->> (t2/select-fn-set :card_id DashboardCard
+ :dashboard_id [:in dashboards]
+ :card_id [:not= (:id card)])
(map (partial t2/select-one Card :id))
filter-visible
(take max-matches))
@@ -307,8 +307,8 @@
(defmethod related Dashboard
[dashboard]
- (let [cards (map (partial t2/select-one Card :id) (db/select-field :card_id DashboardCard
- :dashboard_id (:id dashboard)))]
+ (let [cards (map (partial t2/select-one Card :id) (t2/select-fn-set :card_id DashboardCard
+ :dashboard_id (:id dashboard)))]
{:cards (->> cards
(mapcat (comp similar-questions))
(remove (set cards))
diff --git a/test/metabase/api/card_test.clj b/test/metabase/api/card_test.clj
index cd2ee9193b633fd256da4740f9b8402bc68d67fb..fdaed1e3e8d9a66700af715db2797c84516c7e65 100644
--- a/test/metabase/api/card_test.clj
+++ b/test/metabase/api/card_test.clj
@@ -1754,7 +1754,7 @@
(let [cards (db/select [Card :collection_id] :id [:in (map u/the-id cards-or-card-ids)])
collection-ids (set (filter identity (map :collection_id cards)))
collection-id->name (when (seq collection-ids)
- (db/select-id->field :name Collection :id [:in collection-ids]))]
+ (t2/select-pk->fn :name Collection :id [:in collection-ids]))]
(for [card cards]
(get collection-id->name (:collection_id card))))))
diff --git a/test/metabase/api/dashboard_test.clj b/test/metabase/api/dashboard_test.clj
index 7bbeaa738e2b788fe15901b2d2fb44384db34bb7..aeef9af35caadfae86d7a499070de58b152c19af 100644
--- a/test/metabase/api/dashboard_test.clj
+++ b/test/metabase/api/dashboard_test.clj
@@ -1152,7 +1152,7 @@
(let [copy-id (u/the-id (mt/user-http-request :rasta :post 200 (format "dashboard/%d/copy" dashboard-id)))]
(try
(is (= 2
- (count (db/select-ids DashboardCard, :dashboard_id copy-id))))
+ (count (t2/select-pks-set DashboardCard, :dashboard_id copy-id))))
(is (=? [{:name "Category ID" :slug "category_id" :id "_CATEGORY_ID_" :type :category}]
(t2/select-one-fn :parameters Dashboard :id copy-id)))
(is (=? [{:parameter_id "random-id"
@@ -1256,7 +1256,7 @@
(map (partial into {})
(db/select [DashboardCard :size_x :size_y :col :row], :dashboard_id dashboard-id))))
(is (= #{0}
- (db/select-field :position DashboardCardSeries, :dashboardcard_id (:id dashboard-card)))))))))
+ (t2/select-fn-set :position DashboardCardSeries, :dashboardcard_id (:id dashboard-card)))))))))
(defn do-with-add-card-parameter-mapping-permissions-fixtures [f]
(mt/with-temp-copy-of-db
@@ -1383,12 +1383,12 @@
DashboardCardSeries [_ {:dashboardcard_id dashcard-id, :card_id series-id-2, :position 1}]]
(with-dashboards-in-writeable-collection [dashboard-id]
(is (= 1
- (count (db/select-ids DashboardCard, :dashboard_id dashboard-id))))
+ (count (t2/select-pks-set DashboardCard, :dashboard_id dashboard-id))))
(is (= nil
(mt/user-http-request :rasta :delete 204
(format "dashboard/%d/cards" dashboard-id) :dashcardId dashcard-id)))
(is (= 0
- (count (db/select-ids DashboardCard, :dashboard_id dashboard-id))))))))
+ (count (t2/select-pks-set DashboardCard, :dashboard_id dashboard-id))))))))
;;; +----------------------------------------------------------------------------------------------------------------+
diff --git a/test/metabase/api/permissions_test.clj b/test/metabase/api/permissions_test.clj
index c77dae7da0b7ced6576a2515fe2515cf522da1c3..d12b781a48b316bf472079f63833939ed55d413c 100644
--- a/test/metabase/api/permissions_test.clj
+++ b/test/metabase/api/permissions_test.clj
@@ -319,7 +319,7 @@
:user_id su/IntGreaterThanZero
:is_group_manager s/Bool}]}
result))
- (is (= (db/select-field :id 'User) (set (keys result))))))))
+ (is (= (t2/select-fn-set :id 'User) (set (keys result))))))))
(deftest add-group-membership-test
(testing "POST /api/permissions/membership"
diff --git a/test/metabase/api/table_test.clj b/test/metabase/api/table_test.clj
index 2c4874f15deda14dc1500bcdca69855ee9f4f30b..59dbd36fd4b022b88367e90b2b96fc0880c4604a 100644
--- a/test/metabase/api/table_test.clj
+++ b/test/metabase/api/table_test.clj
@@ -518,7 +518,7 @@
:dimension_options (default-dimension-options)
:fields (map (comp #(merge (default-card-field-for-venues card-virtual-table-id) %)
with-field-literal-id)
- (let [id->fingerprint (db/select-id->field :fingerprint Field :table_id (mt/id :venues))
+ (let [id->fingerprint (t2/select-pk->fn :fingerprint Field :table_id (mt/id :venues))
name->fingerprint (comp id->fingerprint (partial mt/id :venues))]
[{:name "NAME"
:display_name "NAME"
diff --git a/test/metabase/automagic_dashboards/core_test.clj b/test/metabase/automagic_dashboards/core_test.clj
index e700c5ec143110c3f58cf277304c6116d2048aca..6075eb931f385185e84215442b51785b78371b96 100644
--- a/test/metabase/automagic_dashboards/core_test.clj
+++ b/test/metabase/automagic_dashboards/core_test.clj
@@ -109,7 +109,7 @@
(mt/with-test-user :rasta
(automagic-dashboards.test/with-dashboard-cleanup
(doseq [field (db/select Field
- :table_id [:in (db/select-field :id Table :db_id (mt/id))]
+ :table_id [:in (t2/select-fn-set :id Table :db_id (mt/id))]
:visibility_type "normal"
{:order-by [[:id :asc]]})]
(is (pos? (count (:ordered_cards (magic/automagic-analysis field {})))))))))
diff --git a/test/metabase/db/schema_migrations_test.clj b/test/metabase/db/schema_migrations_test.clj
index 75596e8631efcfeff656a50f01040f2655fc64ae..cab3e4f97526b0e4888c054b6b5d72dab645bea0 100644
--- a/test/metabase/db/schema_migrations_test.clj
+++ b/test/metabase/db/schema_migrations_test.clj
@@ -829,12 +829,12 @@
(is (= #{"F1 D1"
"F1 D2"
"F2 D1"}
- (db/select-field :name Dimension {:order-by [[:id :asc]]})))
+ (t2/select-fn-set :name Dimension {:order-by [[:id :asc]]})))
(migrate!)
(testing "Keep the newest Dimensions"
(is (= #{"F1 D2"
"F2 D1"}
- (db/select-field :name Dimension {:order-by [[:id :asc]]}))))))))
+ (t2/select-fn-set :name Dimension {:order-by [[:id :asc]]}))))))))
(deftest clean-up-gtap-table-test
(testing "Migrations v46.00-064 to v46.00-067: rename `group_table_access_policy` table, add `permission_id` FK,
diff --git a/test/metabase/driver/mysql_test.clj b/test/metabase/driver/mysql_test.clj
index 9c1c43167a59c0657667898614a23097d586d773..bffb4792f1d910a6767f9e80e497c38b2b853cec 100644
--- a/test/metabase/driver/mysql_test.clj
+++ b/test/metabase/driver/mysql_test.clj
@@ -126,7 +126,7 @@
["Empty Vending Machine" 0]]]])
(defn- db->fields [db]
- (let [table-ids (db/select-ids Table :db_id (u/the-id db))]
+ (let [table-ids (t2/select-pks-set Table :db_id (u/the-id db))]
(set (map (partial into {}) (db/select [Field :name :base_type :semantic_type] :table_id [:in table-ids])))))
(deftest tiny-int-1-test
diff --git a/test/metabase/driver/postgres_test.clj b/test/metabase/driver/postgres_test.clj
index 721491a0ab2a91cf2032c6364f7fa6c02c32708f..8e0337d5634095fed78d42df8afeb1cbdf02ef5f 100644
--- a/test/metabase/driver/postgres_test.clj
+++ b/test/metabase/driver/postgres_test.clj
@@ -939,10 +939,9 @@
:percent-email 0.0
:percent-state 0.0
:average-length 12.0}}}}
- (db/select-field->field :name :fingerprint Field
+ (t2/select-fn->fn :name :fingerprint Field
:table_id (t2/select-one-pk Table :db_id (u/the-id database))))))))))
-
;;; ----------------------------------------------------- Other ------------------------------------------------------
(deftest exception-test
@@ -1010,7 +1009,7 @@
(mt/with-temp Database [database {:engine :postgres, :details test-user-details}]
(sync/sync-database! database)
(is (= #{"table_with_perms"}
- (db/select-field :name Table :db_id (:id database)))))))))
+ (t2/select-fn-set :name Table :db_id (:id database)))))))))
(deftest json-operator-?-works
(testing "Make sure the Postgres ? operators (for JSON types) work in native queries"
diff --git a/test/metabase/integrations/common_test.clj b/test/metabase/integrations/common_test.clj
index eee954ee9c0a38496c35574e5075e52cd07755b5..2e83a217756efa96ddc1125e543665591d2bfad0 100644
--- a/test/metabase/integrations/common_test.clj
+++ b/test/metabase/integrations/common_test.clj
@@ -21,8 +21,8 @@
(defn- group-memberships
"Return set of names of PermissionsGroups `user` currently belongs to."
[user]
- (when-let [group-ids (seq (db/select-field :group_id PermissionsGroupMembership :user_id (u/the-id user)))]
- (db/select-field :name PermissionsGroup :id [:in group-ids])))
+ (when-let [group-ids (seq (t2/select-fn-set :group_id PermissionsGroupMembership :user_id (u/the-id user)))]
+ (t2/select-fn-set :name PermissionsGroup :id [:in group-ids])))
(deftest sync-groups-test
(testing "does syncing group memberships leave existing memberships in place if nothing has changed?"
diff --git a/test/metabase/models/collection_test.clj b/test/metabase/models/collection_test.clj
index 2c6d93202c8bb019c19867641e8d6ad6fe11b86b..a4f7446f0ac3e5adc124eb0ee667c3550e51cc2f 100644
--- a/test/metabase/models/collection_test.clj
+++ b/test/metabase/models/collection_test.clj
@@ -187,7 +187,7 @@
(when (seq path)
(let [ids (collection/location-path->ids path)
id->name (when (seq ids)
- (db/select-field->field :id :name Collection :id [:in ids]))]
+ (t2/select-fn->fn :id :name Collection :id [:in ids]))]
;; now loop through each ID and replace the ID part like (ex. /10/) with a name (ex. /A/)
(loop [path path, [id & more] ids]
(if-not id
@@ -1110,12 +1110,12 @@
;; we can reuse the `perms-path-ids->names` helper function from above, just need to stick `collection` in a map
;; to simulate the output of the `with-collection-hierarchy` macro
(perms-path-ids->names
- (zipmap (map :name collections)
- collections)
- (db/select-field :object Permissions
- {:where [:and
- [:like :object "/collection/%"]
- [:= :group_id (u/the-id perms-group)]]})))
+ (zipmap (map :name collections)
+ collections)
+ (t2/select-fn-set :object Permissions
+ {:where [:and
+ [:like :object "/collection/%"]
+ [:= :group_id (u/the-id perms-group)]]})))
(deftest copy-root-collection-perms-test
(testing (str "Make sure that when creating a new Collection at the Root Level, we copy the group permissions for "
diff --git a/test/metabase/models/dashboard_card_test.clj b/test/metabase/models/dashboard_card_test.clj
index 7bd1f8b03c0e5478d413171a0f3c721f29b0272d..70c935124d9e1d3823c44519ada1cee141c8f9a9 100644
--- a/test/metabase/models/dashboard_card_test.clj
+++ b/test/metabase/models/dashboard_card_test.clj
@@ -96,7 +96,7 @@
Card [{card-id3 :id} {:name "card3"}]]
(let [upd-series (fn [series]
(dashboard-card/update-dashboard-card-series! {:id dashcard-id} series)
- (set (for [card-id (db/select-field :card_id DashboardCardSeries, :dashboardcard_id dashcard-id)]
+ (set (for [card-id (t2/select-fn-set :card_id DashboardCardSeries, :dashboardcard_id dashcard-id)]
(t2/select-one-fn :name Card, :id card-id))))]
(is (= #{}
(upd-series [])))
diff --git a/test/metabase/models/permissions_test.clj b/test/metabase/models/permissions_test.clj
index 27fceabd793f5803cf5b12956e0faed23a6c7dbd..7d4f504d3f05c51afc760c17a2e4232dc16677be 100644
--- a/test/metabase/models/permissions_test.clj
+++ b/test/metabase/models/permissions_test.clj
@@ -12,7 +12,6 @@
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[metabase.util :as u]
- [toucan.db :as db]
[toucan2.core :as t2]))
(set! *warn-on-reflection* true)
@@ -814,9 +813,9 @@
(deftest grant-revoke-root-collection-permissions-test
(mt/with-temp PermissionsGroup [{group-id :id}]
(letfn [(perms []
- (db/select-field :object Permissions {:where [:and
- [:like :object "/collection/%"]
- [:= :group_id group-id]]}))]
+ (t2/select-fn-set :object Permissions {:where [:and
+ [:like :object "/collection/%"]
+ [:= :group_id group-id]]}))]
(is (= nil
(perms)))
(testing "Should be able to grant Root Collection perms"
@@ -847,7 +846,7 @@
(deftest grant-revoke-application-permissions-test
(mt/with-temp PermissionsGroup [{group-id :id}]
(letfn [(perms []
- (db/select-field :object Permissions
+ (t2/select-fn-set :object Permissions
{:where [:and [:= :group_id group-id]
[:like :object "/application/%"]]}))]
(is (= nil (perms)))
diff --git a/test/metabase/models/pulse_channel_test.clj b/test/metabase/models/pulse_channel_test.clj
index 1f6d3754856f02f3543c4ae990eae1e7eeb11c2c..c3ee3f92fc7dafdfca70629eda676398552f4d3e 100644
--- a/test/metabase/models/pulse_channel_test.clj
+++ b/test/metabase/models/pulse_channel_test.clj
@@ -10,7 +10,6 @@
[metabase.models.user :refer [User]]
[metabase.test :as mt]
[metabase.util :as u]
- [toucan.db :as db]
[toucan.hydrate :refer [hydrate]]
[toucan2.core :as t2])
(:import
@@ -325,7 +324,7 @@
PulseChannel [{channel-id :id} {:pulse_id pulse-id}]]
(letfn [(upd-recipients! [recipients]
(pulse-channel/update-recipients! channel-id recipients)
- (db/select-field :user_id PulseChannelRecipient, :pulse_channel_id channel-id))]
+ (t2/select-fn-set :user_id PulseChannelRecipient, :pulse_channel_id channel-id))]
(doseq [[new-recipients expected] {[] nil
[:rasta] [:rasta]
[:crowberto] [:crowberto]
diff --git a/test/metabase/models/pulse_test.clj b/test/metabase/models/pulse_test.clj
index 1ea667f52e3b119c902baf8ba3c3ed84b3e3f739..43b8d6d10775099433dd736e19cc41ca7c98a3d2 100644
--- a/test/metabase/models/pulse_test.clj
+++ b/test/metabase/models/pulse_test.clj
@@ -125,8 +125,8 @@
2 card-2
3 card-3))]
(pulse/update-notification-cards! pulse (map pulse/card->ref cards)))
- (when-let [card-ids (seq (db/select-field :card_id PulseCard, :pulse_id (u/the-id pulse)))]
- (db/select-field :name Card, :id [:in card-ids])))]
+ (when-let [card-ids (seq (t2/select-fn-set :card_id PulseCard, :pulse_id (u/the-id pulse)))]
+ (t2/select-fn-set :name Card, :id [:in card-ids])))]
(doseq [[cards expected] {[] nil
[1] #{"card1"}
[2] #{"card2"}
diff --git a/test/metabase/models/user_test.clj b/test/metabase/models/user_test.clj
index 865d71fe4962d83de03f61609fee3e2180a28c85..a102016995749d5d0fd049a88427753de2bb31a0 100644
--- a/test/metabase/models/user_test.clj
+++ b/test/metabase/models/user_test.clj
@@ -237,7 +237,7 @@
(defn group-names [groups-or-ids]
(when (seq groups-or-ids)
- (db/select-field :name PermissionsGroup :id [:in (map u/the-id groups-or-ids)])))
+ (t2/select-fn-set :name PermissionsGroup :id [:in (map u/the-id groups-or-ids)])))
(defn- do-with-group [group-properties group-members f]
(mt/with-temp PermissionsGroup [group group-properties]
diff --git a/test/metabase/query_processor/middleware/results_metadata_test.clj b/test/metabase/query_processor/middleware/results_metadata_test.clj
index 39f60d432d8588972efb71674bf1023dcbbedbae..dd34b4a0325af96a6a3b9046006bd6d2bd96bb91 100644
--- a/test/metabase/query_processor/middleware/results_metadata_test.clj
+++ b/test/metabase/query_processor/middleware/results_metadata_test.clj
@@ -13,7 +13,6 @@
[metabase.util :as u]
[metabase.util.schema :as su]
[schema.core :as s]
- [toucan.db :as db]
[toucan2.core :as t2]))
(defn- card-metadata [card]
@@ -25,7 +24,7 @@
(mt/round-all-decimals 2 data))
(defn- default-card-results []
- (let [id->fingerprint (db/select-id->field :fingerprint Field :table_id (mt/id :venues))
+ (let [id->fingerprint (t2/select-pk->fn :fingerprint Field :table_id (mt/id :venues))
name->fingerprint (comp id->fingerprint (partial mt/id :venues))]
[{:name "ID"
:display_name "ID"
diff --git a/test/metabase/sync/analyze/query_results_test.clj b/test/metabase/sync/analyze/query_results_test.clj
index f8afc13342357205cabd5fc544544b0139cb085a..f4214d72b51a4716f5224d257cd48ef80408a95e 100644
--- a/test/metabase/sync/analyze/query_results_test.clj
+++ b/test/metabase/sync/analyze/query_results_test.clj
@@ -13,7 +13,7 @@
[metabase.test.sync :as test.sync]
[metabase.test.util :as tu]
[metabase.util :as u]
- [toucan.db :as db]))
+ [toucan2.core :as t2]))
(defn- column->name-keyword [field-or-column-metadata]
(-> field-or-column-metadata
@@ -64,7 +64,7 @@
(defn- app-db-venue-fingerprints
"Get a map of keyword field name (as lowercased keyword) => fingerprint from the app DB."
[]
- (update-keys (db/select-field->field :name :fingerprint Field :table_id (mt/id :venues))
+ (update-keys (t2/select-fn->fn :name :fingerprint Field :table_id (mt/id :venues))
(comp keyword u/lower-case-en)))
(deftest mbql-result-metadata-test
diff --git a/test/metabase/sync/analyze_test.clj b/test/metabase/sync/analyze_test.clj
index d64ea9c024285426971efd3da843776b01ba2320..8a52e10b3472db5c7f74ad48a837241b51113697 100644
--- a/test/metabase/sync/analyze_test.clj
+++ b/test/metabase/sync/analyze_test.clj
@@ -82,7 +82,7 @@
:last_analyzed #t "2017-08-09T00:00Z"}]]
(#'analyze/update-fields-last-analyzed! table)
(is (= #{"Current fingerprint, not analyzed"}
- (db/select-field :name Field :table_id (u/the-id table), :last_analyzed [:> #t "2018-01-01"])))))))
+ (t2/select-fn-set :name Field :table_id (u/the-id table), :last_analyzed [:> #t "2018-01-01"])))))))
(deftest survive-fingerprinting-errors
(testing "Make sure we survive fingerprinting failing"
diff --git a/test/metabase/sync/sync_metadata/comments_test.clj b/test/metabase/sync/sync_metadata/comments_test.clj
index c5b13220c7b765d12062c23de2dbdf111a8bb2d7..67c2e0a84ae021f9de31922eb5bb9f129a559c9d 100644
--- a/test/metabase/sync/sync_metadata/comments_test.clj
+++ b/test/metabase/sync/sync_metadata/comments_test.clj
@@ -14,7 +14,7 @@
[toucan2.core :as t2]))
(defn- db->fields [db]
- (let [table-ids (db/select-ids Table :db_id (u/the-id db))]
+ (let [table-ids (t2/select-pks-set Table :db_id (u/the-id db))]
(set (map (partial into {}) (db/select ['Field :name :description] :table_id [:in table-ids])))))
(tx/defdataset basic-field-comments
diff --git a/test/metabase/sync/sync_metadata/fields/sync_instances_test.clj b/test/metabase/sync/sync_metadata/fields/sync_instances_test.clj
index 294d060989ebdcc667d30a44768d862cf618fb8a..a6b165d1ac8107778891b7108a85af6ddba92127 100644
--- a/test/metabase/sync/sync_metadata/fields/sync_instances_test.clj
+++ b/test/metabase/sync/sync_metadata/fields/sync_instances_test.clj
@@ -73,7 +73,7 @@
(sync-metadata/sync-db-metadata! db)
;; field should be added back
(is (= #{"weight" "age"}
- (db/select-field :name Field :table_id transactions-table-id, :parent_id details-field-id, :active true))))))
+ (t2/select-fn-set :name Field :table_id transactions-table-id, :parent_id details-field-id, :active true))))))
(testing "Syncing can reactivate a field"
(tt/with-temp* [Database [db {:engine ::toucanery/toucanery}]]
@@ -88,7 +88,7 @@
;; now sync again.
(sync-metadata/sync-db-metadata! db)
;; field should be reactivated
- (is (db/select-field :active Field :id age-field-id)))))
+ (is (t2/select-fn-set :active Field :id age-field-id)))))
(testing "Nested fields get reactivated if the parent field gets reactivated"
(tt/with-temp* [Database [db {:engine ::toucanery/toucanery}]]
@@ -103,7 +103,7 @@
;; now sync again.
(sync-metadata/sync-db-metadata! db)
;; field should be reactivated
- (is (db/select-field :active Field :id age-field-id)))))
+ (is (t2/select-fn-set :active Field :id age-field-id)))))
(testing "Nested fields can be marked inactive"
(tt/with-temp* [Database [db {:engine ::toucanery/toucanery}]]
diff --git a/test/metabase/sync/sync_metadata/fields_test.clj b/test/metabase/sync/sync_metadata/fields_test.clj
index 28c20bd3a4060d6d2d76b4833601d7ff7c86315d..12add82617f1f2845fc4f7c69091221667430f95 100644
--- a/test/metabase/sync/sync_metadata/fields_test.clj
+++ b/test/metabase/sync/sync_metadata/fields_test.clj
@@ -60,7 +60,7 @@
(set
(map (partial into {})
(db/select [Field :id :name :active]
- :table_id [:in (db/select-ids Table :db_id (u/the-id database))])))))]
+ :table_id [:in (t2/select-pks-set Table :db_id (u/the-id database))])))))]
(is (= {:before-sync #{{:name "species", :active true}
{:name "example_name", :active true}}
:after-sync #{{:name "species", :active true}
@@ -85,7 +85,7 @@
(set
(map (partial into {})
(db/select [Field :name :active]
- :table_id [:in (db/select-ids Table :db_id (u/the-id database))])))))))))
+ :table_id [:in (t2/select-pks-set Table :db_id (u/the-id database))])))))))))
(deftest dont-show-deleted-fields-test
(testing "make sure deleted fields doesn't show up in `:fields` of a table"
diff --git a/test/metabase/sync/sync_metadata/tables_test.clj b/test/metabase/sync/sync_metadata/tables_test.clj
index e16dc1942b5069ef55335f71e3f3760faeef50ba..4c9abac24db0d017184c8d5f642d44dfc4e98b4d 100644
--- a/test/metabase/sync/sync_metadata/tables_test.clj
+++ b/test/metabase/sync/sync_metadata/tables_test.clj
@@ -7,7 +7,8 @@
[metabase.test :as mt]
[metabase.test.data.interface :as tx]
[metabase.util :as u]
- [toucan.db :as db]))
+ [toucan.db :as db]
+ [toucan2.core :as t2]))
(tx/defdataset db-with-some-cruft
[["acquired_toucans"
@@ -38,4 +39,4 @@
Table [_ {:name "Table 2", :db_id (u/the-id db)}]]
(#'sync-tables/retire-tables! db #{{:name "Table 1", :schema (:schema table-1)}})
(is (= {"Table 1" false, "Table 2" true}
- (db/select-field->field :name :active Table, :db_id (u/the-id db)))))))
+ (t2/select-fn->fn :name :active Table, :db_id (u/the-id db)))))))
diff --git a/test/metabase/test.clj b/test/metabase/test.clj
index 3b8cdd281502f8c8e22b691d3ff57023f8f4fc9b..70121202ad79e3a5c47838eeedebeec84d70566a 100644
--- a/test/metabase/test.clj
+++ b/test/metabase/test.clj
@@ -49,7 +49,8 @@
[potemkin :as p]
[toucan.db :as db]
[toucan.models :as models]
- [toucan.util.test :as tt]))
+ [toucan.util.test :as tt]
+ [toucan2.core :as t2]))
(set! *warn-on-reflection* true)
@@ -309,7 +310,7 @@
[attributes thunk]
(let [existing-admin-memberships (db/select PermissionsGroupMembership :group_id (:id (perms-group/admin)))
_ (db/simple-delete! PermissionsGroupMembership :group_id (:id (perms-group/admin)))
- existing-admin-ids (db/select-ids User :is_superuser true)
+ existing-admin-ids (t2/select-pks-set User :is_superuser true)
_ (when (seq existing-admin-ids)
(db/update-where! User {:id [:in existing-admin-ids]} :is_superuser false))
temp-admin (db/insert! User (merge (with-temp-defaults User)
diff --git a/test/metabase/test/data/impl.clj b/test/metabase/test/data/impl.clj
index c597c97b27e2f90129978703b9f13da5d1e3ee5b..8876737df304736fe79beb0b8aa3c7b45d8ef798 100644
--- a/test/metabase/test/data/impl.clj
+++ b/test/metabase/test/data/impl.clj
@@ -203,7 +203,7 @@
(throw
(Exception. (format "No Table %s found for %s Database %d %s.\nFound: %s"
(pr-str table-name) driver db-id (pr-str db-name)
- (u/pprint-to-str (db/select-id->field :name Table, :db_id db-id, :active true)))))))))
+ (u/pprint-to-str (t2/select-pk->fn :name Table, :db_id db-id, :active true)))))))))
(defn- qualified-field-name [{parent-id :parent_id, field-name :name}]
(if parent-id
@@ -256,8 +256,8 @@
(for [field (db/select Field :table_id old-table-id {:order-by [[:id :asc]]})]
(-> field (dissoc :id :fk_target_field_id) (assoc :table_id new-table-id))))
;; now copy the FieldValues as well.
- (let [old-field-id->name (db/select-id->field :name Field :table_id old-table-id)
- new-field-name->id (db/select-field->id :name Field :table_id new-table-id)
+ (let [old-field-id->name (t2/select-pk->fn :name Field :table_id old-table-id)
+ new-field-name->id (t2/select-fn->pk :name Field :table_id new-table-id)
old-field-values (db/select FieldValues :field_id [:in (set (keys old-field-id->name))])]
(db/insert-many! FieldValues
(for [{old-field-id :field_id, :as field-values} old-field-values
diff --git a/test/metabase/test/util.clj b/test/metabase/test/util.clj
index 488d13a0c1b2bbdfaa1f41c44c20af49482ae8b9..5f6b7bffe348ab7519fe751f4b93874a22b0e545 100644
--- a/test/metabase/test/util.clj
+++ b/test/metabase/test/util.clj
@@ -729,8 +729,8 @@
(initialize/initialize-if-needed! :db)
(let [read-path (perms/collection-read-path collection-or-id)
readwrite-path (perms/collection-readwrite-path collection-or-id)
- groups-with-read-perms (db/select-field :group_id Permissions :object read-path)
- groups-with-readwrite-perms (db/select-field :group_id Permissions :object readwrite-path)]
+ groups-with-read-perms (t2/select-fn-set :group_id Permissions :object read-path)
+ groups-with-readwrite-perms (t2/select-fn-set :group_id Permissions :object readwrite-path)]
(hawk.parallel/assert-test-is-not-parallel "with-discarded-collections-perms-changes")
(try
(f)
@@ -762,7 +762,7 @@
(finally
(when (and (:metabase.models.collection.root/is-root? collection)
(not (:namespace collection)))
- (doseq [group-id (db/select-ids PermissionsGroup :id [:not= (u/the-id (perms-group/admin))])]
+ (doseq [group-id (t2/select-pks-set PermissionsGroup :id [:not= (u/the-id (perms-group/admin))])]
(when-not (db/exists? Permissions :group_id group-id, :object "/collection/root/")
(perms/grant-collection-readwrite-permissions! group-id collection/root-collection)))))))
diff --git a/test/metabase/transforms/core_test.clj b/test/metabase/transforms/core_test.clj
index c529107f069d1071bc070698327b4df0f3bdbb02..eae966b865ac837993a3b24f88108f8b1de05a3a 100644
--- a/test/metabase/transforms/core_test.clj
+++ b/test/metabase/transforms/core_test.clj
@@ -15,7 +15,6 @@
[metabase.transforms.core :as tf]
[metabase.transforms.specs :as tf.specs]
[metabase.util :as u]
- [toucan.db :as db]
[toucan2.core :as t2]))
(use-fixtures :each (fn [thunk]
@@ -61,7 +60,7 @@
(deftest tableset-test
(testing "Can we get a tableset for a given schema?"
- (is (= (db/select-ids Table :db_id (mt/id))
+ (is (= (t2/select-pks-set Table :db_id (mt/id))
(set (map u/the-id (#'tf/tableset (mt/id) "PUBLIC")))))))
(deftest find-tables-with-domain-entity-test