fix(db): migration index names & save upload id as string

Author: LouisHaftmann

lib/db/index.ts

@@ -1,3 +1,5 @@
+import { hash } from 'node:crypto'
+
 import { Kysely, Migrator } from 'kysely'
 
 import type { DatabaseDriverName } from '~/lib/db/drivers'
@@ -9,6 +11,7 @@ import { logger } from '~/lib/logger'
 import type { Selectable } from 'kysely'
 
 export interface CacheKeysTable {
+  id: string
   key: string
   version: string
   updated_at: string
@@ -18,11 +21,11 @@ export interface UploadsTable {
   created_at: string
   key: string
   version: string
-  id: number
+  id: string
   driver_upload_id: string
 }
 export interface UploadPartsTable {
-  upload_id: number
+  upload_id: string
   part_number: number
   e_tag: string | null
 }
@@ -86,8 +89,7 @@ export async function findKeyMatch(
   logger.debug('Finding key match', args)
   const exactPrimaryMatch = await db
     .selectFrom('cache_keys')
-    .where('key', '=', args.key)
-    .where('version', '=', args.version)
+    .where('id', '=', getCacheKeyId(args.key, args.version))
     .selectAll()
     .executeTakeFirst()
   if (exactPrimaryMatch) {
@@ -117,8 +119,7 @@ export async function findKeyMatch(
   for (const key of args.restoreKeys) {
     const exactMatch = await db
       .selectFrom('cache_keys')
-      .where('version', '=', args.version)
-      .where('key', '=', key)
+      .where('id', '=', getCacheKeyId(key, args.version))
       .orderBy('cache_keys.updated_at desc')
       .selectAll()
       .executeTakeFirst()
@@ -161,8 +162,7 @@ export async function updateOrCreateKey(
     .updateTable('cache_keys')
     .set('updated_at', now.toISOString())
     .set('accessed_at', now.toISOString())
-    .where('key', '=', key)
-    .where('version', '=', version)
+    .where('id', '=', getCacheKeyId(key, version))
     .executeTakeFirst()
   if (Number(updateResult.numUpdatedRows) === 0) {
     await createKey(db, { key, version, date })
@@ -177,8 +177,7 @@ export async function touchKey(
   await db
     .updateTable('cache_keys')
     .set('accessed_at', now.toISOString())
-    .where('key', '=', key)
-    .where('version', '=', version)
+    .where('id', '=', getCacheKeyId(key, version))
     .execute()
 }
 
@@ -205,6 +204,7 @@ export async function createKey(
   await db
     .insertInto('cache_keys')
     .values({
+      id: getCacheKeyId(key, version),
       key,
       version,
       updated_at: now.toISOString(),
@@ -213,15 +213,15 @@ export async function createKey(
     .execute()
 }
 
+function getCacheKeyId(key: string, version: string) {
+  return hash('sha256', Buffer.from(`${key}-${version}`))
+}
+
 export async function pruneKeys(db: DB, keys?: Selectable<CacheKeysTable>[]) {
   if (keys) {
     await db.transaction().execute(async (tx) => {
       for (const { key, version } of keys ?? []) {
-        await tx
-          .deleteFrom('cache_keys')
-          .where('key', '=', key)
-          .where('version', '=', version)
-          .execute()
+        await tx.deleteFrom('cache_keys').where('id', '=', getCacheKeyId(key, version)).execute()
       }
     })
   } else {

lib/db/migrations.ts

@@ -8,13 +8,11 @@ export function migrations(dbType: DatabaseDriverName) {
       async up(db) {
         let query = db.schema
           .createTable('cache_keys')
-          .addColumn('key', dbType === 'mysql' ? 'varchar(512)' : 'text', (col) => col.notNull())
-          .addColumn('version', dbType === 'mysql' ? 'varchar(512)' : 'text', (col) =>
-            col.notNull(),
-          )
+          .addColumn('id', 'varchar(255)', (col) => col.notNull().primaryKey())
+          .addColumn('key', 'text', (col) => col.notNull())
+          .addColumn('version', 'text', (col) => col.notNull())
           .addColumn('updated_at', 'text', (col) => col.notNull())
           .addColumn('accessed_at', 'text', (col) => col.notNull())
-          .addPrimaryKeyConstraint('pk', ['key', 'version'])
 
         if (dbType === 'mysql') query = query.modifyEnd(sql`engine=InnoDB CHARSET=latin1`)
 
@@ -32,17 +30,17 @@ export function migrations(dbType: DatabaseDriverName) {
           .addColumn('key', 'text', (col) => col.notNull())
           .addColumn('version', 'text', (col) => col.notNull())
           .addColumn('driver_upload_id', 'text', (col) => col.notNull())
-          .addColumn('id', 'integer', (col) => col.notNull())
-          .addPrimaryKeyConstraint('pk', ['id'])
-          .addUniqueConstraint('key_version', ['key', 'version'])
+          .addColumn('id', dbType === 'mysql' ? 'varchar(255)' : 'text', (col) =>
+            col.notNull().primaryKey(),
+          )
           .ifNotExists()
           .execute()
         await db.schema
           .createTable('upload_parts')
-          .addColumn('upload_id', 'integer')
+          .addColumn('upload_id', dbType === 'mysql' ? 'varchar(255)' : 'text')
           .addColumn('part_number', 'integer')
           .addColumn('e_tag', 'text')
-          .addPrimaryKeyConstraint('pk', ['upload_id', 'part_number'])
+          .addPrimaryKeyConstraint('pk_upload_parts', ['upload_id', 'part_number'])
           .addForeignKeyConstraint(
             'fk_upload_parts_uploads',
             ['upload_id'],
@@ -55,6 +53,7 @@ export function migrations(dbType: DatabaseDriverName) {
       },
       async down(db) {
         await db.schema.dropTable('uploads').ifExists().execute()
+        await db.schema.dropTable('upload_parts').ifExists().execute()
       },
     },
   } satisfies Record<string, Migration>

lib/storage/index.ts

@@ -84,7 +84,7 @@ export async function initializeStorage() {
           .values({
             created_at: new Date().toISOString(),
             driver_upload_id: driverUploadId,
-            id: uploadId,
+            id: uploadId.toString(),
             key,
             version,
           })
@@ -105,7 +105,7 @@ export async function initializeStorage() {
         const upload = await db
           .selectFrom('uploads')
           .selectAll()
-          .where('id', '=', uploadId)
+          .where('id', '=', uploadId.toString())
           .executeTakeFirst()
         if (!upload) {
           logger.debug(`Upload: Upload not found. Ignoring...`, {
@@ -138,7 +138,7 @@ export async function initializeStorage() {
             .insertInto('upload_parts')
             .values({
               part_number: partNumber,
-              upload_id: uploadId,
+              upload_id: uploadId.toString(),
               e_tag: eTag,
             })
             .execute()
@@ -157,7 +157,7 @@ export async function initializeStorage() {
         const upload = await db
           .selectFrom('uploads')
           .selectAll()
-          .where('id', '=', uploadId)
+          .where('id', '=', uploadId.toString())
           .executeTakeFirst()
 
         if (!upload) {