fix: deprecated drizzle pgTable usage

Gi-jutsu · Dec 13, 2024 · d78efb1 · d78efb1
1 parent d769540
commit d78efb1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/src/identity-and-access/infrastructure/drizzle/schema.ts b/src/identity-and-access/infrastructure/drizzle/schema.ts
@@ -23,11 +23,7 @@ export const accountSchema = pgTable(
       .notNull()
       .$defaultFn(() => new Date()),
   },
-  (table) => ({
-    emailUniqueIndex: uniqueIndex("emailUniqueIndex").on(
-      sql`lower(${table.email})`
-    ),
-  })
+  (table) => [uniqueIndex("emailUniqueIndex").on(sql`lower(${table.email})`)]
 );
 
 export const ForgotPasswordRequestSchema = pgTable(
@@ -45,11 +41,11 @@ export const ForgotPasswordRequestSchema = pgTable(
       .notNull()
       .$defaultFn(() => new Date()),
   },
-  (table) => ({
-    uniqueAccountForgotPasswordRequest: uniqueIndex(
-      "idx_unique_account_forgot_password_request"
-    ).on(table.accountId),
-  })
+  (table) => [
+    uniqueIndex("idx_unique_account_forgot_password_request").on(
+      table.accountId
+    ),
+  ]
 );
 
 export type IdentityAndAccessDatabase = NodePgDatabase<{

diff --git a/src/shared-kernel/infrastructure/drizzle/schema.ts b/src/shared-kernel/infrastructure/drizzle/schema.ts
@@ -22,15 +22,13 @@ export const outboxMessageSchema = pgTable(
     processedAt: timestamp("processed_at"),
     errorMessage: varchar("error_message"),
   },
-  (table) => {
-    return {
-      idx_outbox_messages_unprocessed: index("idx_outbox_messages_unprocessed")
-        .on(table.occurredAt, table.processedAt)
-        // @FIXME PostgreSQL 'INCLUDE' is not supported by drizzle-orm
-        // @see https://github.com/drizzle-team/drizzle-orm/issues/2972
-        .where(isNull(table.processedAt)),
-    };
-  }
+  (table) => [
+    index("idx_outbox_messages_unprocessed")
+      .on(table.occurredAt, table.processedAt)
+      // @FIXME PostgreSQL 'INCLUDE' is not supported by drizzle-orm
+      // @see https://github.com/drizzle-team/drizzle-orm/issues/2972
+      .where(isNull(table.processedAt)),
+  ]
 );
 
 export type SharedKernelDatabase = NodePgDatabase<{