simstudioai · icecrasher321 · Sep 16, 2026 · Sep 15, 2026 · Sep 16, 2026
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -254,7 +254,7 @@ If you prefer not to use Docker. **All commands run from the repository root unl
    cd packages/db && bun run db:migrate && cd ../..
    ```
 
-   For ad-hoc schema iteration during development you can also use `bun run db:push` from `packages/db`, but `db:migrate` is the canonical command for both local and CI/CD setups.
+   For ad-hoc schema iteration during development you can also use `bun run db:push` from `packages/db`, but `db:migrate` is the canonical command for staging and production. `db:push` reconciles directly to the current schema without running versioned migration guards or backfills. For disposable local/dev databases, `bun run db:push --force` accepts Drizzle's data-loss prompts, including column drops.
 
 4. **Run the Development Servers:**
 

diff --git a/.github/workflows/migrations.yml b/.github/workflows/migrations.yml
@@ -71,6 +71,8 @@ jobs:
 
           if [ "${ENVIRONMENT}" = "dev" ]; then
             echo "Dev environment — pushing schema directly (db:push)"
+            # Dev deliberately forces direct schema reconciliation; staging and
+            # production use guarded versioned migrations in the other branch.
             # drizzle-kit push needs a TTY to resolve ambiguous renames (--force only
             # covers data-loss). In CI it throws "Interactive prompts require a TTY
             # terminal" but still exits 0, so the job goes green without applying the
@@ -81,7 +83,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

diff --git a/.github/workflows/test-build.yml b/.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.

diff --git a/apps/sim/app/api/files/uploads/finalizers.ts b/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`)

diff --git a/apps/sim/app/api/organizations/[id]/route.ts b/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 })

diff --git a/apps/sim/app/api/v1/admin/credits/route.ts b/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,
           })

diff --git a/apps/sim/app/api/v1/admin/organizations/[id]/billing/route.ts b/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)

diff --git a/apps/sim/app/api/v1/admin/organizations/[id]/route.ts b/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 })

diff --git a/apps/sim/app/api/v1/admin/organizations/route.ts b/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)

diff --git a/apps/sim/app/api/v1/admin/users/[id]/billing/route.ts b/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,

diff --git a/apps/sim/ee/workspace-forking/lib/copy/copy-files.ts b/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,

diff --git a/apps/sim/lib/admin/dashboard.ts b/apps/sim/lib/admin/dashboard.ts
@@ -1,18 +1,15 @@
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db } from '@sim/db'
-import { withInsertColumns } from '@sim/db/insert-columns'
 import {
   member,
   organization,
-  organizationColumns,
   organizationMemberUsageLimit,
   outboxEvent,
   permissions,
   subscription,
   usageLog,
   user,
   userStats,
-  userStatsColumns,
   workspace,
 } from '@sim/db/schema'
 import { generateId } from '@sim/utils/id'
@@ -654,11 +651,7 @@ export async function listDashboardUsers({ search, limit, offset }: PaginationIn
 async function getDashboardOrganizationSummary(organizationId: string) {
   const [[org], [memberCountRow], [externalCountRow], latestSubscription, provisionings] =
     await Promise.all([
-      db
-        .select(organizationColumns)
-        .from(organization)
-        .where(eq(organization.id, organizationId))
-        .limit(1),
+      db.select().from(organization).where(eq(organization.id, organizationId)).limit(1),
       db.select({ value: count() }).from(member).where(eq(member.organizationId, organizationId)),
       db
         .select({ value: countDistinct(permissions.userId) })
@@ -1284,7 +1277,7 @@ export async function updateDashboardOrganizationLimits(
   const providerBacked = await db.transaction(async (tx) => {
     await acquireOrganizationMutationLock(tx, organizationId)
     const [org] = await tx
-      .select(organizationColumns)
+      .select()
       .from(organization)
       .where(eq(organization.id, organizationId))
       .for('update')
@@ -1418,7 +1411,7 @@ export async function grantDashboardOrganizationBalance(
       }),
       operation: async () => {
         const [org] = await tx
-          .select(organizationColumns)
+          .select()
           .from(organization)
           .where(eq(organization.id, organizationId))
           .for('update')
@@ -1526,7 +1519,7 @@ export async function grantDashboardUserBalance(
         ? null
         : getPerUserMinimumLimit(initialSubscription).toString()
     await tx
-      .insert(withInsertColumns(userStats, userStatsColumns))
+      .insert(userStats)
       .values({
         id: generateId(),
         userId,

diff --git a/apps/sim/lib/auth/anonymous.ts b/apps/sim/lib/auth/anonymous.ts
@@ -1,5 +1,4 @@
 import { db } from '@sim/db'
-import { withInsertColumns } from '@sim/db/insert-columns'
 import * as schema from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
@@ -38,7 +37,7 @@ export async function ensureAnonymousUserExists(): Promise<void> {
     })
 
     if (!existingStats) {
-      await db.insert(withInsertColumns(schema.userStats, schema.userStatsColumns)).values({
+      await db.insert(schema.userStats).values({
         id: generateId(),
         userId: ANONYMOUS_USER_ID,
         currentUsageLimit: '10000000000',

diff --git a/apps/sim/lib/auth/sim-auth-adapter.postgres.test.ts b/apps/sim/lib/auth/sim-auth-adapter.postgres.test.ts
@@ -5,7 +5,6 @@ import * as schema from '@sim/db/schema'
 import { withUtcTimestamps } from '@sim/db/timestamps'
 import { generateId } from '@sim/utils/id'
 import type { BetterAuthOptions } from 'better-auth'
-import { drizzleAdapter } from 'better-auth/adapters/drizzle'
 import { organization } from 'better-auth/plugins'
 import { drizzle } from 'drizzle-orm/postgres-js'
 import postgres from 'postgres'
@@ -62,14 +61,10 @@ describe.skipIf(!databaseUrl)('Better Auth across the organization column drop',
           ? adapter.transaction((tx) => exerciseOrganization(tx))
           : exerciseOrganization(adapter)
 
+      await client`ALTER TABLE pg_temp.organization ADD COLUMN departed_member_usage numeric NOT NULL DEFAULT 0`
       await exercise()
       await client`ALTER TABLE pg_temp.organization DROP COLUMN departed_member_usage`
 
-      const unprojected = drizzleAdapter(database, { provider: 'pg', schema })(OPTIONS)
-      await expect(
-        unprojected.findOne({ model: 'organization', where: [{ field: 'id', value: 'missing' }] })
-      ).rejects.toMatchObject({ cause: { code: '42703' } })
-
       await exercise()
     } finally {
       await client.end()

diff --git a/apps/sim/lib/auth/sim-auth-adapter.sql.test.ts b/apps/sim/lib/auth/sim-auth-adapter.sql.test.ts
@@ -1,9 +1,7 @@
 /**
  * @vitest-environment node
  */
-import * as schema from '@sim/db/schema'
 import type { BetterAuthOptions } from 'better-auth'
-import { drizzleAdapter } from 'better-auth/adapters/drizzle'
 import { organization } from 'better-auth/plugins'
 import { drizzle } from 'drizzle-orm/pg-proxy'
 import { describe, expect, it, vi } from 'vitest'
@@ -70,13 +68,4 @@ describe('Better Auth organization SQL', () => {
       expect(query, operation.name).not.toContain('"departed_member_usage"')
     }
   })
-
-  it('retains the full migration schema while the unprojected adapter remains incompatible', async () => {
-    const execute = vi.fn(async (_query: string) => ({ rows: [] }))
-    const adapter = drizzleAdapter(drizzle(execute), { provider: 'pg', schema })(OPTIONS)
-
-    await adapter.findOne({ model: 'organization', where: WHERE })
-
-    expect(execute.mock.calls[0][0]).toContain('"departed_member_usage"')
-  })
 })