refactor: deprecated pgtable schemas

cellajs · Dec 23, 2024 · 7ecd595 · 7ecd595
1 parent 8ff9522
commit 7ecd595
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 36 deletions.
diff --git a/backend/src/db/schema/oauth-accounts.ts b/backend/src/db/schema/oauth-accounts.ts
@@ -15,11 +15,9 @@ export const oauthAccountsTable = pgTable(
       .references(() => usersTable.id, { onDelete: 'cascade' }),
     createdAt: timestamp().defaultNow().notNull(),
   },
-  (table) => {
-    return {
-      pk: primaryKey({
-        columns: [table.providerId, table.providerUserId],
-      }),
-    };
-  },
+  (table) => [
+    primaryKey({
+      columns: [table.providerId, table.providerUserId],
+    }),
+  ],
 );
diff --git a/backend/src/db/schema/organizations.ts b/backend/src/db/schema/organizations.ts
@@ -36,12 +36,7 @@ export const organizationsTable = pgTable(
     modifiedAt: timestamp(),
     modifiedBy: varchar().references(() => usersTable.id, { onDelete: 'set null' }),
   },
-  (table) => {
-    return {
-      nameIndex: index('organizations_name_index').on(table.name.desc()),
-      createdAtIndex: index('organizations_created_at_index').on(table.createdAt.desc()),
-    };
-  },
+  (table) => [index('organizations_name_index').on(table.name.desc()), index('organizations_created_at_index').on(table.createdAt.desc())],
 );
 
 export type OrganizationModel = typeof organizationsTable.$inferSelect;

diff --git a/backend/src/db/schema/requests.ts b/backend/src/db/schema/requests.ts
@@ -13,12 +13,7 @@ export const requestsTable = pgTable(
     type: varchar({ enum: requestTypeEnum }).notNull(),
     createdAt: timestamp().defaultNow().notNull(),
   },
-  (table) => {
-    return {
-      emailIndex: index('requests_emails').on(table.email.desc()),
-      createdAtIndex: index('requests_created_at').on(table.createdAt.desc()),
-    };
-  },
+  (table) => [index('requests_emails').on(table.email.desc()), index('requests_created_at').on(table.createdAt.desc())],
 );
 
 export type RequestsModel = typeof requestsTable.$inferSelect;

diff --git a/backend/src/db/schema/sessions.ts b/backend/src/db/schema/sessions.ts
@@ -26,11 +26,7 @@ export const sessionsTable = pgTable(
     expiresAt: timestamp({ withTimezone: true, mode: 'date' }).notNull(),
     adminUserId: varchar().references(() => usersTable.id, { onDelete: 'cascade' }),
   },
-  (table) => {
-    return {
-      adminUserIdIndex: index('idx_admin_id').on(table.adminUserId),
-    };
-  },
+  (table) => [index('idx_admin_id').on(table.adminUserId)],
 );
 
 export type SessionModel = typeof sessionsTable.$inferSelect;

diff --git a/backend/src/db/schema/users.ts b/backend/src/db/schema/users.ts
@@ -36,18 +36,16 @@ export const usersTable = pgTable(
     modifiedBy: varchar(),
     role: varchar({ enum: roleEnum }).notNull().default('user'),
   },
-  (table) => {
-    return {
-      nameIndex: index('users_name_index').on(table.name.desc()),
-      unsubscribeTokenIndex: index('users_token_index').on(table.unsubscribeToken),
-      emailIndex: index('users_email_index').on(table.email.desc()),
-      createdAtIndex: index('users_created_at_index').on(table.createdAt.desc()),
-      modifiedByReference: foreignKey({
-        columns: [table.modifiedBy],
-        foreignColumns: [table.id],
-      }),
-    };
-  },
+  (table) => [
+    index('users_name_index').on(table.name.desc()),
+    index('users_token_index').on(table.unsubscribeToken),
+    index('users_email_index').on(table.email.desc()),
+    index('users_created_at_index').on(table.createdAt.desc()),
+    foreignKey({
+      columns: [table.modifiedBy],
+      foreignColumns: [table.id],
+    }),
+  ],
 );
 
 export const safeUserSelect = omitKeys(usersTable, config.sensitiveFields);