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
2 changes: 1 addition & 1 deletion packages/plugins/policy/src/policy-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ export class PolicyHandler<Schema extends SchemaDef> extends OperationNodeTransf
selections = [SelectionNode.create(SelectAllNode.create())];
}

const modelPolicyFilter = this.buildPolicyFilter(model, alias, operation);
const modelPolicyFilter = this.buildPolicyFilter(model, model, operation);
if (!isTrueNode(modelPolicyFilter)) {
hasPolicies = true;
}
Expand Down
53 changes: 53 additions & 0 deletions tests/regression/test/issue-2385.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { createPolicyTestClient } from '@zenstackhq/testtools';
import { describe, expect, it } from 'vitest';

describe('Regression for issue #2385', () => {
it('should not generate "missing FROM-clause entry" when including a relation with a static-value @@allow policy', async () => {
const db = await createPolicyTestClient(
`
model User {
id String @id @default(uuid())
name String
associations Association[]
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@allow("read", auth().id == id)
}

model Association {
id String @id @default(uuid())
name String
userId String @db.VarChar @map("user_id")
user User @relation(fields: [userId], references: [id])
createdAt DateTime @default(now()) @allow("read", auth().id == userId)
updatedAt DateTime @updatedAt

@@allow("read", auth().id == userId)
}
`,
);

const rawDb = db.$unuseAll();
const user = await rawDb.user.create({
data: {
name: 'John Doe',
},
});

await rawDb.association.create({
data: {
name: 'Association for John',
userId: user.id,
},
});

const userDb = db.$setAuth(user);

await expect(
userDb.user.findMany({
include: { associations: true },
}),
).toResolveTruthy();
});
});
Loading