chore(db): drop retired usage columns and compatibility scaffolding

Author: icecrasher321

.github/workflows/migrations.yml

@@ -81,7 +81,6 @@ jobs:
               echo "ERROR: db:push needs an interactive rename decision; land it as a versioned migration instead of relying on push." >&2
               exit 1
             fi
-            bun run ./scripts/apply-dev-workspace-file-size-cutover.ts
           else
             echo "Applying versioned migrations (db:migrate)"
             bun run ./scripts/migrate.ts

.github/workflows/test-build.yml

@@ -85,6 +85,12 @@ jobs:
         working-directory: packages/db
         run: bun run db:migrate
 
+      - name: Verify retired-column contract migration in PostgreSQL
+        working-directory: packages/db
+        env:
+          RETIRED_COLUMNS_TEST_DATABASE_URL: postgresql://postgres:postgres@127.0.0.1:5432/sim_auth_scim
+        run: bunx vitest run scripts/retired-columns.postgres.test.ts
+
       - name: Verify OAuth lifecycle and SCIM membership guards in PostgreSQL
         working-directory: apps/sim
         # These suites share a schema and install triggers; parallel files can deadlock DDL against cleanup.

apps/sim/app/api/files/uploads/finalizers.ts

@@ -1,8 +1,7 @@
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { type Principal, resolvePrincipalAuditAttribution } from '@sim/auth/principal'
 import { db } from '@sim/db'
-import { withInsertColumns } from '@sim/db/insert-columns'
-import { type WorkspaceFileRow, workspaceFileColumns, workspaceFiles } from '@sim/db/schema'
+import { type WorkspaceFileRow, workspaceFiles } from '@sim/db/schema'
 import { generateId } from '@sim/utils/id'
 import { eq, sql } from 'drizzle-orm'
 import type { V2File } from '@/lib/api/contracts/v2/files'
@@ -367,7 +366,7 @@ async function insertOrLoadFileMetadata(
 
   const now = new Date()
   const [inserted] = await db
-    .insert(withInsertColumns(workspaceFiles, workspaceFileColumns))
+    .insert(workspaceFiles)
     .values({
       id: generateId(),
       key: input.key,
@@ -384,7 +383,7 @@ async function insertOrLoadFileMetadata(
       contentUpdatedAt: now,
     })
     .onConflictDoNothing()
-    .returning(workspaceFileColumns)
+    .returning()
 
   if (inserted) return { file: inserted, created: true }
 
@@ -399,7 +398,7 @@ async function insertOrLoadFileMetadata(
 
 async function findFileMetadataByKey(key: string): Promise<FileMetadataRecord | undefined> {
   const [file] = await db
-    .select(workspaceFileColumns)
+    .select()
     .from(workspaceFiles)
     .where(eq(workspaceFiles.key, key))
     .orderBy(sql`${workspaceFiles.deletedAt} IS NULL DESC`)

apps/sim/app/api/organizations/[id]/route.ts

@@ -1,6 +1,6 @@
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db } from '@sim/db'
-import { member, organization, organizationColumns } from '@sim/db/schema'
+import { member, organization } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { isOrgAdminRole } from '@sim/platform-authz/workspace'
 import { and, eq, ne } from 'drizzle-orm'
@@ -64,7 +64,7 @@ export const GET = withRouteHandler(
       }
 
       const organizationEntry = await db
-        .select(organizationColumns)
+        .select()
         .from(organization)
         .where(eq(organization.id, organizationId))
         .limit(1)
@@ -156,7 +156,7 @@ export const PUT = withRouteHandler(
       if (name !== undefined || slug !== undefined || logo !== undefined) {
         if (slug !== undefined) {
           const existingSlug = await db
-            .select(organizationColumns)
+            .select()
             .from(organization)
             .where(and(eq(organization.slug, slug), ne(organization.id, organizationId)))
             .limit(1)
@@ -180,7 +180,7 @@ export const PUT = withRouteHandler(
           .update(organization)
           .set(updateData)
           .where(eq(organization.id, organizationId))
-          .returning(organizationColumns)
+          .returning()
 
         if (updatedOrg.length === 0) {
           return NextResponse.json({ error: 'Organization not found' }, { status: 404 })

apps/sim/app/api/v1/admin/credits/route.ts

@@ -25,8 +25,7 @@
 
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db } from '@sim/db'
-import { withInsertColumns } from '@sim/db/insert-columns'
-import { organization, subscription, user, userStats, userStatsColumns } from '@sim/db/schema'
+import { organization, subscription, user, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { generateShortId } from '@sim/utils/id'
 import { normalizeEmail } from '@sim/utils/string'
@@ -156,7 +155,7 @@ export const POST = withRouteHandler(
           .limit(1)
 
         if (!existingStats) {
-          await db.insert(withInsertColumns(userStats, userStatsColumns)).values({
+          await db.insert(userStats).values({
             id: generateShortId(),
             userId: entityId,
           })

apps/sim/app/api/v1/admin/organizations/[id]/billing/route.ts

@@ -16,7 +16,7 @@
  */
 
 import { db, dbReplica } from '@sim/db'
-import { member, organization, organizationColumns } from '@sim/db/schema'
+import { member, organization } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { count, eq } from 'drizzle-orm'
 import {
@@ -155,7 +155,7 @@ export const PATCH = withRouteHandler(
       if (!parsed.success) return parsed.response
 
       const [orgData] = await db
-        .select(organizationColumns)
+        .select()
         .from(organization)
         .where(eq(organization.id, organizationId))
         .limit(1)

apps/sim/app/api/v1/admin/organizations/[id]/route.ts

@@ -38,7 +38,7 @@ import {
   recordAuditBatch,
 } from '@sim/audit'
 import { db } from '@sim/db'
-import { member, organization, organizationColumns, subscription } from '@sim/db/schema'
+import { member, organization, subscription } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, count, eq, inArray, isNull, not, or } from 'drizzle-orm'
 import {
@@ -93,7 +93,7 @@ export const GET = withRouteHandler(
 
     try {
       const [orgData] = await db
-        .select(organizationColumns)
+        .select()
         .from(organization)
         .where(eq(organization.id, organizationId))
         .limit(1)
@@ -144,7 +144,7 @@ export const PATCH = withRouteHandler(
 
     try {
       const [existing] = await db
-        .select(organizationColumns)
+        .select()
         .from(organization)
         .where(eq(organization.id, organizationId))
         .limit(1)
@@ -183,7 +183,7 @@ export const PATCH = withRouteHandler(
         .update(organization)
         .set(updateData)
         .where(eq(organization.id, organizationId))
-        .returning(organizationColumns)
+        .returning()
 
       const updatedFields = auditUpdatedFields(updateData)
       logger.info(`Admin API: Updated organization ${organizationId}`, { updatedFields })

apps/sim/app/api/v1/admin/organizations/route.ts

@@ -27,7 +27,7 @@
 
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db, dbReplica } from '@sim/db'
-import { member, organization, organizationColumns, user } from '@sim/db/schema'
+import { member, organization, user } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { slugify } from '@sim/utils/string'
 import { count, eq } from 'drizzle-orm'
@@ -155,7 +155,7 @@ export const POST = withRouteHandler(
       })
 
       const [createdOrg] = await db
-        .select(organizationColumns)
+        .select()
         .from(organization)
         .where(eq(organization.id, organizationId))
         .limit(1)

apps/sim/app/api/v1/admin/users/[id]/billing/route.ts

@@ -20,15 +20,7 @@
  */
 
 import { db } from '@sim/db'
-import { withInsertColumns } from '@sim/db/insert-columns'
-import {
-  member,
-  organization,
-  subscription,
-  user,
-  userStats,
-  userStatsColumns,
-} from '@sim/db/schema'
+import { member, organization, subscription, user, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { generateShortId } from '@sim/utils/id'
 import { eq, or } from 'drizzle-orm'
@@ -86,11 +78,7 @@ export const GET = withRouteHandler(
         return notFoundResponse('User')
       }
 
-      const [stats] = await db
-        .select(userStatsColumns)
-        .from(userStats)
-        .where(eq(userStats.userId, userId))
-        .limit(1)
+      const [stats] = await db.select().from(userStats).where(eq(userStats.userId, userId)).limit(1)
 
       // Canonical current-period usage (attributed usage_log, refresh-adjusted)
       // comes from the same helper users see.
@@ -180,7 +168,7 @@ export const PATCH = withRouteHandler(
       }
 
       const [existingStats] = await db
-        .select(userStatsColumns)
+        .select()
         .from(userStats)
         .where(eq(userStats.userId, userId))
         .limit(1)
@@ -248,7 +236,7 @@ export const PATCH = withRouteHandler(
       if (existingStats) {
         await db.update(userStats).set(updateData).where(eq(userStats.userId, userId))
       } else {
-        await db.insert(withInsertColumns(userStats, userStatsColumns)).values({
+        await db.insert(userStats).values({
           id: generateShortId(),
           userId,
           ...updateData,

apps/sim/ee/workspace-forking/lib/copy/copy-files.ts

@@ -1,6 +1,5 @@
 import { db } from '@sim/db'
-import { withInsertColumns } from '@sim/db/insert-columns'
-import { workspaceFileColumns, workspaceFiles } from '@sim/db/schema'
+import { workspaceFiles } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
@@ -197,7 +196,7 @@ export async function planForkFileCopies(params: {
     selectors.length === 0
       ? []
       : await tx
-          .select(workspaceFileColumns)
+          .select()
           .from(workspaceFiles)
           .where(
             and(
@@ -363,7 +362,7 @@ export async function executeForkFileBlobCopies(
         await db.transaction(async (tx) => {
           assertForkCopyActive(control)
           const [inserted] = await tx
-            .insert(withInsertColumns(workspaceFiles, workspaceFileColumns))
+            .insert(workspaceFiles)
             .values({
               id: task.targetFileId,
               key: task.targetKey,