Skip to content

fix(auth): Lazily initialize the Better Auth Drizzle adapter. #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Brooooooklyn merged 1 commit into from
Aug 28, 2026
Merged

fix(auth): Lazily initialize the Better Auth Drizzle adapter. #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/void/src/auth/drizzle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,16 @@ export function generateVoidAuthDatabaseModule(
`import { db as __voidDb } from "void/db";`,
`import { schema as __voidAuthSchema } from ${schemaImport};`,
'',
`export const __voidAuthDatabase = drizzleAdapter(__voidDb, { provider: ${JSON.stringify(
'// Better Auth reads Drizzle metadata while creating the adapter.',
'// Defer that work until request handling, when runtime bindings are available.',
'let __voidAuthDatabaseInstance: ReturnType<typeof drizzleAdapter> | undefined;',
'',
'export const __voidAuthDatabase: ReturnType<typeof drizzleAdapter> = (options) => {',
` __voidAuthDatabaseInstance ??= drizzleAdapter(__voidDb, { provider: ${JSON.stringify(
provider,
)}, schema: __voidAuthSchema });`,
' return __voidAuthDatabaseInstance(options);',
'};',
'',
].join('\n');
}
12 changes: 10 additions & 2 deletions packages/void/test/unit/auth-drizzle.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,23 @@ describe('Better Auth Drizzle codegen', () => {
expect(code).toContain('"name": "members"');
});

it('can generate an auth database module that reuses void/db', () => {
it('lazily creates an auth database adapter that reuses void/db', () => {
const code = generateVoidAuthDatabaseModule({
dialect: 'postgresql',
schemaImportPath: '/project/.void/better-auth-schema.ts',
drizzleAdapterPath: '/resolved/better-auth/adapters/drizzle.mjs',
});

expect(code).toContain('import { db as __voidDb } from "void/db"');
expect(code).toContain('drizzleAdapter(__voidDb');
expect(code).toContain(
'let __voidAuthDatabaseInstance: ReturnType<typeof drizzleAdapter> | undefined;',
);
expect(code).toContain(
'export const __voidAuthDatabase: ReturnType<typeof drizzleAdapter> = (options) => {',
);
expect(code).toContain('__voidAuthDatabaseInstance ??= drizzleAdapter(__voidDb');
expect(code).toContain('return __voidAuthDatabaseInstance(options);');
expect(code).not.toContain('export const __voidAuthDatabase = drizzleAdapter(__voidDb');
expect(code).not.toContain('import pg from');
});
});