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
24 changes: 14 additions & 10 deletions packages/schema/src/plugins/enhancer/policy/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
getAttributeArg,
getAuthDecl,
getDataModelAndTypeDefs,
getDataModels,
getEntityCheckerFunctionName,
getIdFields,
getLiteral,
Expand Down Expand Up @@ -537,16 +538,19 @@ export function generateNormalizedAuthRef(
* Check if the given enum is referenced in the model
*/
export function isEnumReferenced(model: Model, decl: Enum): unknown {
return streamAllContents(model).some((node) => {
if (isDataModelField(node) && node.type.reference?.ref === decl) {
// referenced as field type
return true;
}
if (isEnumFieldReference(node) && node.target.ref?.$container === decl) {
// enum field is referenced
return true;
}
return false;
const dataModels = getDataModels(model);
return dataModels.some((dm) => {
return streamAllContents(dm).some((node) => {
if (isDataModelField(node) && node.type.reference?.ref === decl) {
// referenced as field type
return true;
}
if (isEnumFieldReference(node) && node.target.ref?.$container === decl) {
// enum field is referenced
return true;
}
return false;
});
});
}

Expand Down
28 changes: 28 additions & 0 deletions tests/regression/tests/issue-1835.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { loadSchema } from '@zenstackhq/testtools';

describe('issue 1835', () => {
it('regression', async () => {
await loadSchema(
`
enum Enum {
SOME_VALUE
ANOTHER_VALUE
}

model Model {
id String @id @default(cuid())
value Enum
@@ignore
}

model AnotherModel {
id String @id @default(cuid())
}
`,
{
provider: 'postgresql',
pushDb: false,
}
);
});
});
Loading