Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions packages/runtime/src/enhancements/node/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,7 @@ export function makeProxy<T extends PrismaProxyHandler>(
if ($extends && typeof $extends === 'function') {
return (...args: any[]) => {
const result = $extends.bind(target)(...args);
if (!result[PRISMA_PROXY_ENHANCER]) {
return makeProxy(result, modelMeta, makeHandler, name + '$ext', errorTransformer);
} else {
// avoid double wrapping
return result;
}
return makeProxy(result, modelMeta, makeHandler, name + '$ext', errorTransformer);
};
} else {
return $extends;
Expand Down
39 changes: 39 additions & 0 deletions tests/regression/tests/issue-2014.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { loadSchema } from '@zenstackhq/testtools';

describe('issue 2014', () => {
it('regression', async () => {
const { prisma, enhance } = await loadSchema(
`
model Tenant {
id Int @id @default(autoincrement())

users User[]
}

model User {
id Int @id @default(autoincrement())
tenantId Int @default(auth().tenantId)
tenant Tenant @relation(fields: [tenantId], references: [id])

@@allow('all', true)
}
`,
{ logPrismaQuery: true }
);

const tenant = await prisma.tenant.create({ data: {} });
const user = await prisma.user.create({ data: { tenantId: tenant.id } });

const db = enhance(user);
const extendedDb = db.$extends({});

await expect(
extendedDb.user.create({
data: {},
})
).resolves.toEqual({
id: 2,
tenantId: tenant.id,
});
});
});
Loading