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
4 changes: 4 additions & 0 deletions packages/orm/src/client/helpers/schema-db-pusher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ export class SchemaDbPusher<Schema extends SchemaDef> {
for (const field of Object.values(model.fields)) {
// relation order
if (field.relation && field.relation.fields && field.relation.references) {
// skip self-referential relations to avoid false cycle in toposort
if (field.type === model.name) {
continue;
}
const targetModel = requireModel(this.schema, field.type);
// edge: fk side -> target model
graph.push([model, targetModel]);
Expand Down
37 changes: 37 additions & 0 deletions tests/regression/test/issue-2435.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { createTestClient } from '@zenstackhq/testtools';
import { describe, expect, it } from 'vitest';

// https://github.com/zenstackhq/zenstack/issues/2435
describe('Regression for issue 2435', () => {
it('should not throw cyclic dependency error when delegate model has a self-referential relation', async () => {
await expect(
createTestClient(
`
enum ContentType {
POST
ARTICLE
QUESTION
}

model Content {
id Int @id @default(autoincrement())
type ContentType
@@delegate(type)
}

model Post extends Content {
post1s Post1[]
replies Post[] @relation("PostReplies")
parentId Int?
parent Post? @relation("PostReplies", fields: [parentId], references: [id])
}

model Post1 extends Content {
post Post @relation(fields: [postId], references: [id])
postId Int
}
`,
),
).toResolveTruthy();
});
});
Loading