From f6488bd4b54eb4efd3b0cb5436d5609e084d54c4 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Tue, 21 Jan 2025 12:46:12 -0600 Subject: [PATCH] migrated to new api fo constraints away from deprecated api --- ving/drizzle/schema/APIKey.mjs | 6 +++--- ving/drizzle/schema/CronJob.mjs | 4 ++-- ving/drizzle/schema/S3File.mjs | 6 +++--- ving/drizzle/schema/User.mjs | 10 +++++----- ving/generator/drizzletable.mjs | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ving/drizzle/schema/APIKey.mjs b/ving/drizzle/schema/APIKey.mjs index b8000c1e..fb077102 100644 --- a/ving/drizzle/schema/APIKey.mjs +++ b/ving/drizzle/schema/APIKey.mjs @@ -13,8 +13,8 @@ export const APIKeyTable = mysqlTable('apikeys', privateKey: varchar('privateKey', { length: 39 }).notNull().default(''), userId: bigint('userId', {mode:'number', unsigned: true}).notNull() }, - (table) => ({ - apikeys_user_90ada4_fk: foreignKey({ name: "apikeys_user_90ada4_fk", columns: [table.userId], foreignColumns: [UserTable.id]}).onDelete("cascade").onUpdate("cascade") - }) + (table) => ([ + foreignKey({ name: "apikeys_user_90ada4_fk", columns: [table.userId], foreignColumns: [UserTable.id]}).onDelete("cascade").onUpdate("cascade") + ]) ); diff --git a/ving/drizzle/schema/CronJob.mjs b/ving/drizzle/schema/CronJob.mjs index b31ee50a..cccd2091 100644 --- a/ving/drizzle/schema/CronJob.mjs +++ b/ving/drizzle/schema/CronJob.mjs @@ -13,8 +13,8 @@ export const CronJobTable = mysqlTable('cronjobs', enabled: boolean('enabled').notNull().default(true), note: text('note').notNull() }, - (table) => ({ + (table) => ([ - }) + ]) ); diff --git a/ving/drizzle/schema/S3File.mjs b/ving/drizzle/schema/S3File.mjs index 6f330aa4..18fe0f19 100644 --- a/ving/drizzle/schema/S3File.mjs +++ b/ving/drizzle/schema/S3File.mjs @@ -17,8 +17,8 @@ export const S3FileTable = mysqlTable('s3files', icon: mysqlEnum('icon', ['pending','thumbnail','extension','self']).notNull().default('pending'), userId: bigint('userId', {mode:'number', unsigned: true}).notNull() }, - (table) => ({ - s3files_user_40cb3d4d_fk: foreignKey({ name: "s3files_user_40cb3d4d_fk", columns: [table.userId], foreignColumns: [UserTable.id]}).onDelete("cascade").onUpdate("cascade") - }) + (table) => ([ + foreignKey({ name: "s3files_user_40cb3d4d_fk", columns: [table.userId], foreignColumns: [UserTable.id]}).onDelete("cascade").onUpdate("cascade") + ]) ); diff --git a/ving/drizzle/schema/User.mjs b/ving/drizzle/schema/User.mjs index eb5a81f7..4c0c63b9 100644 --- a/ving/drizzle/schema/User.mjs +++ b/ving/drizzle/schema/User.mjs @@ -20,10 +20,10 @@ export const UserTable = mysqlTable('users', bio: mediumText('bio').notNull(), avatarId: bigint('avatarId', {mode:'number', unsigned: true}).default(null) }, - (table) => ({ - usernameIndex: uniqueIndex('usernameIndex').on(table.username), - emailIndex: uniqueIndex('emailIndex').on(table.email), - users_avatar_39d62890_fk: foreignKey({ name: "users_avatar_39d62890_fk", columns: [table.avatarId], foreignColumns: [S3FileTable.id]}).onDelete("set null").onUpdate("no action") - }) + (table) => ([ + uniqueIndex('usernameIndex').on(table.username), + uniqueIndex('emailIndex').on(table.email), + foreignKey({ name: "users_avatar_39d62890_fk", columns: [table.avatarId], foreignColumns: [S3FileTable.id]}).onDelete("set null").onUpdate("no action") + ]) ); diff --git a/ving/generator/drizzletable.mjs b/ving/generator/drizzletable.mjs index ec792db1..1621d623 100644 --- a/ving/generator/drizzletable.mjs +++ b/ving/generator/drizzletable.mjs @@ -13,16 +13,16 @@ export const makeBaseTable = (schema) => { const fields = [prop.name, ...prop.uniqueQualifiers]; const composite = fields.join('_'); const key = composite.substring(0, 48) + '_' + miniHash(composite) + '_uq'; - specialConstraints.push(`${key}: unique('${key}').on(table.${fields.join(', table.')})`); + specialConstraints.push(`unique('${key}').on(table.${fields.join(', table.')})`); } else { - specialConstraints.push(`${prop.name}Index: uniqueIndex('${prop.name}Index').on(table.${prop.name})`); + specialConstraints.push(`uniqueIndex('${prop.name}Index').on(table.${prop.name})`); } } if (prop.relation && ['parent', 'sibling'].includes(prop.relation.type)) { const composite = [schema.tableName, prop.relation.name].join('_'); const key = composite.substring(0, 48) + '_' + miniHash(composite) + '_fk'; - specialConstraints.push(`${key}: foreignKey({ name: "${key}", columns: [table.${prop.name}], foreignColumns: [${prop.relation?.kind}Table.id]}).onDelete(${prop.required ? '"cascade"' : '"set null"'}).onUpdate(${prop.required ? '"cascade"' : '"no action"'})`); + specialConstraints.push(`foreignKey({ name: "${key}", columns: [table.${prop.name}], foreignColumns: [${prop.relation?.kind}Table.id]}).onDelete(${prop.required ? '"cascade"' : '"set null"'}).onUpdate(${prop.required ? '"cascade"' : '"no action"'})`); } } } @@ -31,9 +31,9 @@ export const ${schema.kind}Table = mysqlTable('${schema.tableName}', { ${columns.join(",\n\t\t")} }, - (table) => ({ + (table) => ([ ${specialConstraints.join(",\n\t\t")} - }) + ]) ); `; }