tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix(drizzle): generate DB schema syntax is deprecated (#14031)

Browse Source
This commit is contained in:
Sasha
2025-10-02 06:12:49 +03:00
committed by GitHub
parent 9d6cae0445
commit ef57d24200
2 changed files with 1661 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/drizzle/src/utilities/createSchemaGenerator.ts
View File

@@ -118,7 +118,7 @@ export const createSchemaGenerator = ({
if (table.indexes) { if (table.indexes) {
for (const key in table.indexes) { for (const key in table.indexes) {
const index = table.indexes[key] const index = table.indexes[key]
let indexDeclaration = `${sanitizeObjectKey(key)}: ${index.unique ? 'uniqueIndex' : 'index'}('${index.name}')` let indexDeclaration = `${index.unique ? 'uniqueIndex' : 'index'}('${index.name}')`
indexDeclaration += `.on(${typeof index.on === 'string' ? `${accessProperty('columns', index.on)}` : `${index.on.map((on) => `${accessProperty('columns', on)}`).join(', ')}`}),` indexDeclaration += `.on(${typeof index.on === 'string' ? `${accessProperty('columns', index.on)}` : `${index.on.map((on) => `${accessProperty('columns', on)}`).join(', ')}`}),`
extrasDeclarations.push(indexDeclaration) extrasDeclarations.push(indexDeclaration)
} }
@@ -128,7 +128,7 @@ export const createSchemaGenerator = ({
for (const key in table.foreignKeys) { for (const key in table.foreignKeys) {
const foreignKey = table.foreignKeys[key] const foreignKey = table.foreignKeys[key]
let foreignKeyDeclaration = `${sanitizeObjectKey(key)}: foreignKey({ let foreignKeyDeclaration = `foreignKey({
columns: [${foreignKey.columns.map((col) => `columns['${col}']`).join(', ')}], columns: [${foreignKey.columns.map((col) => `columns['${col}']`).join(', ')}],
foreignColumns: [${foreignKey.foreignColumns.map((col) => `${accessProperty(col.table, col.name)}`).join(', ')}], foreignColumns: [${foreignKey.foreignColumns.map((col) => `${accessProperty(col.table, col.name)}`).join(', ')}],
name: '${foreignKey.name}' name: '${foreignKey.name}'
@@ -166,9 +166,9 @@ ${Object.entries(table.columns)
.join('\n')} .join('\n')}
}${ }${
extrasDeclarations.length extrasDeclarations.length
? `, (columns) => ({ ? `, (columns) => [
${extrasDeclarations.join('\n ')} ${extrasDeclarations.join(' ')}
})` ]`
: '' : ''
} }
) )

2093
test/database/payload-generated-schema.ts
View File

File diff suppressed because it is too large Load Diff