Skip to content

Commit d003606

Browse files
committed
it doesn't need to be a transaction anymore
1 parent 934a3b7 commit d003606

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

nexus/db-queries/src/db/datastore/scim_provider_store.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,7 @@ impl<'a> CrdbScimProviderStore<'a> {
298298
Ok(convert_to_scim_user(new_user, None))
299299
}
300300

301-
/// Optimized version of list_users_in_txn that uses a single query with
302-
/// joins instead of N+1 queries.
303-
async fn list_users_with_groups_in_txn(
301+
async fn list_users_with_groups(
304302
&self,
305303
conn: &async_bb8_diesel::Connection<DbConnection>,
306304
err: OptionalError<ProviderStoreError>,
@@ -1464,16 +1462,7 @@ impl<'a> ProviderStore for CrdbScimProviderStore<'a> {
14641462
let err: OptionalError<ProviderStoreError> = OptionalError::new();
14651463

14661464
let users = self
1467-
.datastore
1468-
.transaction_retry_wrapper("scim_list_users")
1469-
.transaction(&conn, |conn| {
1470-
let err = err.clone();
1471-
let filter = filter.clone();
1472-
1473-
async move {
1474-
self.list_users_with_groups_in_txn(&conn, err, filter).await
1475-
}
1476-
})
1465+
.list_users_with_groups(&conn, err.clone(), filter)
14771466
.await
14781467
.map_err(|e| {
14791468
if let Some(e) = err.take() {

0 commit comments

Comments
 (0)