Skip to content

fix: preserve transaction state in $use, $unuse, and $unuseAll #2497

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
ymc9 merged 3 commits into from
Mar 21, 2026
Merged

fix: preserve transaction state in $use, $unuse, and $unuseAll #2497

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce30ea2
fix: preserve transaction state in $use, $unuse, and $unuseAll
pkudinov Mar 19, 2026
abeac6f
fix(orm): preserve cloned clients inside transactions
pkudinov Mar 20, 2026
0a46d48
refactor: local refactor
ymc9 Mar 21, 2026
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
12 changes: 12 additions & 0 deletions packages/orm/src/client/client-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,10 @@ export class ClientImpl {
newClient.inputValidator = new InputValidator(newClient as any, {
enabled: newOptions.validateInput !== false,
});
// preserve transaction state so the new client stays in the same transaction
if (this.kysely.isTransaction) {
Comment thread
ymc9 marked this conversation as resolved.
Outdated
newClient.kysely = this.kysely;
}
return newClient;
}

Expand All @@ -399,6 +403,10 @@ export class ClientImpl {
newClient.inputValidator = new InputValidator(newClient as any, {
enabled: newClient.$options.validateInput !== false,
});
// preserve transaction state so the new client stays in the same transaction
if (this.kysely.isTransaction) {
newClient.kysely = this.kysely;
}
return newClient;
}

Expand All @@ -414,6 +422,10 @@ export class ClientImpl {
newClient.inputValidator = new InputValidator(newClient as any, {
enabled: newOptions.validateInput !== false,
});
// preserve transaction state so the new client stays in the same transaction
if (this.kysely.isTransaction) {
newClient.kysely = this.kysely;
}
return newClient;
}

Expand Down
39 changes: 39 additions & 0 deletions tests/e2e/orm/client-api/transaction.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,45 @@ describe('Client raw query tests', () => {

await expect(client.user.findMany()).toResolveWithLength(0);
});

it('$unuseAll preserves transaction isolation', async () => {
await expect(
client.$transaction(async (tx) => {
await tx.$unuseAll().user.create({
data: { email: 'u1@test.com' },
});
throw new Error('rollback');
}),
).rejects.toThrow('rollback');

await expect(client.user.findMany()).toResolveWithLength(0);
});

it('$unuse preserves transaction isolation', async () => {
await expect(
client.$transaction(async (tx) => {
await tx.$unuse('nonexistent').user.create({
data: { email: 'u1@test.com' },
});
throw new Error('rollback');
}),
).rejects.toThrow('rollback');

await expect(client.user.findMany()).toResolveWithLength(0);
});

it('$use preserves transaction isolation', async () => {
await expect(
client.$transaction(async (tx) => {
await (tx as any).$use({ id: 'noop', handle: (_node: any, proceed: any) => proceed(_node) }).user.create({
data: { email: 'u1@test.com' },
});
throw new Error('rollback');
}),
).rejects.toThrow('rollback');

await expect(client.user.findMany()).toResolveWithLength(0);
});
});

describe('sequential transaction', () => {
Expand Down
Loading