Skip to content

fix(drizzle): skip foreign key for blocks that are shared across collections #14395

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

Closed
wants to merge 8 commits into from
Closed

fix(drizzle): skip foreign key for blocks that are shared across collections #14395

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
deaba5a
fix(drizzle): skip foreign key for blocks that are shared across coll…
technicaldirector Oct 29, 2025
d54a272
fix(drizzle): recursively traverse collections to identify shared blocks
technicaldirector Nov 3, 2025
35531a5
fix(drizzle): recursively traverse collections - handle flattened fie…
technicaldirector Nov 3, 2025
2c75847
fix(drizzle): recursively traverse collections - lint issues
technicaldirector Nov 3, 2025
68a5734
Merge branch 'main' of https://github.com/payloadcms/payload
r1tsuu Nov 5, 2025
79b06bc
fix: correctly handle block references, add a unit test to `findShare…
r1tsuu Nov 5, 2025
4e2a295
make the property optional
r1tsuu Nov 5, 2025
ede2a0e
account for `dbName` as well
r1tsuu Nov 5, 2025
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
11 changes: 8 additions & 3 deletions packages/drizzle/src/schema/traverseFields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,13 @@ export const traverseFields = ({
},
}

const baseForeignKeys: Record<string, RawForeignKey> = {
_parentIdFk: {
// Skip creating a parent_id foreign key for blocks that are shared across collections (have a custom dbName)
const hasCustomDbName = block.dbName !== undefined && block.dbName !== null
Copy link

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using a more concise nullish coalescing check. The condition can be simplified to block.dbName != null which checks for both undefined and null in a single comparison.

Suggested change
const hasCustomDbName = block.dbName !== undefined && block.dbName !== null
const hasCustomDbName = block.dbName != null

Copilot uses AI. Check for mistakes.
const shouldSkipForeignKey = hasCustomDbName

const baseForeignKeys: Record<string, RawForeignKey> = {}
if (!shouldSkipForeignKey) {
baseForeignKeys._parentIdFk = {
name: `${blockTableName}_parent_id_fk`,
columns: ['_parentID'],
foreignColumns: [
Expand All @@ -461,7 +466,7 @@ export const traverseFields = ({
},
],
onDelete: 'cascade',
},
}
}

const isLocalized =
Expand Down
Loading