From 327ee71411ede9585330f330bf9da2beaaa025cf Mon Sep 17 00:00:00 2001 From: sakamoto-wk <24515562+sakamoto-wk@users.noreply.github.com> Date: Wed, 4 Feb 2026 07:07:18 +0900 Subject: [PATCH] fix(adapter): use `getCurrentAdapter` for user lookup to avoid transaction deadlock (#7758) (cherry picked from commit 7db4e609527826d315607df5c2243448c1f4d27b) (cherry picked from commit ae14b2ebda4745d04ae3d8babe6911381ea9a7c8) --- packages/better-auth/src/db/internal-adapter.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/better-auth/src/db/internal-adapter.ts b/packages/better-auth/src/db/internal-adapter.ts index 05cf499696..6ed9ddf14c 100644 --- a/packages/better-auth/src/db/internal-adapter.ts +++ b/packages/better-auth/src/db/internal-adapter.ts @@ -348,7 +348,9 @@ export const createInternalAdapter = ( ); } - const user = await adapter.findOne({ + const user = await ( + await getCurrentAdapter(adapter) + ).findOne({ model: "user", where: [ {