fix(projects): retire rollout marker with legacy membership

Author: mzxchandra

packages/db/maintenance/project-membership.sql

@@ -5,9 +5,16 @@ SET statement_timeout = '60s';
 --> statement-breakpoint
 DO $$ BEGIN
   IF to_regclass('public.project_membership_rollout') IS NULL THEN
-    RAISE EXCEPTION 'Project membership rollout marker is missing' USING ERRCODE = '55000';
-  END IF;
-  IF NOT EXISTS (SELECT 1 FROM public.project_membership_rollout WHERE id = 'membership' AND phase = 'column') THEN
+    IF to_regclass('public.project_workspace') IS NOT NULL
+      OR NOT EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'public.workspace'::regclass
+        AND attname = 'project_id' AND attnotnull AND NOT attisdropped)
+      OR (SELECT count(*) FROM pg_constraint
+        WHERE conrelid = 'public.workspace'::regclass AND contype = 'f' AND convalidated
+        AND conname IN ('workspace_project_id_project_id_fk',
+          'workspace_project_organization_fk', 'workspace_fork_project_fk')) <> 3 THEN
+      RAISE EXCEPTION 'Project membership rollout marker is missing before completed contraction' USING ERRCODE = '55000';
+    END IF;
+  ELSIF NOT EXISTS (SELECT 1 FROM public.project_membership_rollout WHERE id = 'membership' AND phase = 'column') THEN
     RAISE EXCEPTION 'Project membership authority must switch before enforcement' USING ERRCODE = '55000';
   END IF;
   IF NOT pg_try_advisory_lock(hashtextextended('sim:project-backfill-operator', 0)) THEN
@@ -189,6 +196,8 @@ ALTER TABLE workspace DROP CONSTRAINT IF EXISTS workspace_project_id_present;
 --> statement-breakpoint
 -- migration-safe: contract of #8830, gated on its authority-aware release being fully deployed, incompatible app/worker versions having drained, and the column-authority switch being committed; no supported application reader or writer then needs this connector.
 DROP TABLE IF EXISTS project_workspace;
+-- migration-safe: contract of #8830, whose deployed readers recognize the required column and validated foreign keys after both temporary tables disappear atomically under the workspace barrier.
+DROP TABLE IF EXISTS project_membership_rollout;
 --> statement-breakpoint
 COMMIT;
 --> statement-breakpoint

packages/db/maintenance/project-rollout.ts

@@ -9,9 +9,19 @@ type ProjectMembershipPhase = 'connector' | 'column'
 export async function readProjectMembershipPhase(
   sql: Sql | TransactionSql
 ): Promise<ProjectMembershipPhase> {
-  const [table] =
-    await sql`SELECT to_regclass('public.project_membership_rollout') IS NOT NULL AS present`
-  if (!table?.present) throw new Error('Project membership rollout marker is missing')
+  const [table] = await sql`SELECT
+    to_regclass('public.project_membership_rollout') IS NOT NULL AS present,
+    to_regclass('public.project_workspace') IS NULL
+    AND EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = to_regclass('public.workspace')
+      AND attname = 'project_id' AND attnotnull AND NOT attisdropped)
+    AND (SELECT count(*) = 3 FROM pg_constraint
+      WHERE conrelid = to_regclass('public.workspace') AND contype = 'f' AND convalidated
+      AND conname IN ('workspace_project_id_project_id_fk',
+        'workspace_project_organization_fk', 'workspace_fork_project_fk')) AS complete`
+  if (!table?.present) {
+    if (table?.complete) return 'column'
+    throw new Error('Project membership rollout marker is missing before completed contraction')
+  }
   const rows = await sql<
     { id: string; phase: string }[]
   >`SELECT id, phase FROM public.project_membership_rollout`
@@ -64,26 +74,3 @@ export async function switchProjectMembershipAuthority(sql: Sql): Promise<void>
     }
   }
 }
-
-/** Only an empty final schema push may initialize a missing singleton directly in column mode. */
-export async function bootstrapProjectColumnAuthority(sql: Sql): Promise<void> {
-  await sql.begin(async (tx) => {
-    await tx`SET LOCAL statement_timeout = '3s'`
-    await tx`LOCK TABLE public.workspace IN ACCESS EXCLUSIVE MODE NOWAIT`
-    const [state] = await tx`SELECT
-      to_regclass('public.project_workspace') IS NULL AS retired,
-      EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'public.workspace'::regclass
-        AND attname = 'project_id' AND attnotnull AND NOT attisdropped) AS required,
-      NOT EXISTS (SELECT 1 FROM public.workspace) AND NOT EXISTS (SELECT 1 FROM public.project) AS empty`
-    if (!state?.retired || !state.required)
-      throw new Error('Project authority bootstrap requires the fresh final schema')
-    const [table] =
-      await tx`SELECT to_regclass('public.project_membership_rollout') IS NOT NULL AS present`
-    if (!table?.present)
-      throw new Error('Project membership rollout table is missing from the final schema')
-    const rows = await tx`SELECT id, phase FROM public.project_membership_rollout`
-    if (!rows.length && state.empty)
-      await tx`INSERT INTO public.project_membership_rollout (id, phase) VALUES ('membership', 'column')`
-    await assertProjectColumnAuthority(tx)
-  })
-}

packages/db/migrations/meta/0407_snapshot.json

@@ -30610,41 +30610,6 @@
       "policies": {},
       "checkConstraints": {},
       "isRLSEnabled": false
-    },
-    "public.project_membership_rollout": {
-      "name": "project_membership_rollout",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "phase": {
-          "name": "phase",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'connector'"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {
-        "project_membership_rollout_singleton": {
-          "name": "project_membership_rollout_singleton",
-          "value": "\"project_membership_rollout\".\"id\" = 'membership'"
-        },
-        "project_membership_rollout_phase": {
-          "name": "project_membership_rollout_phase",
-          "value": "\"project_membership_rollout\".\"phase\" IN ('connector', 'column')"
-        }
-      },
-      "isRLSEnabled": false
     }
   },
   "enums": {

packages/db/schema.ts

@@ -2148,24 +2148,6 @@ export const project = pgTable(
   })
 )
 
-/** contract-pending(after #8830 is fully deployed): #8590 drops this with the connector; readers recognize the completed schema. */
-export const projectMembershipRollout = pgTable(
-  'project_membership_rollout',
-  {
-    id: text('id').primaryKey(),
-    phase: text('phase', { enum: ['connector', 'column'] })
-      .notNull()
-      .default('connector'),
-  },
-  (table) => ({
-    singleton: check('project_membership_rollout_singleton', sql`${table.id} = 'membership'`),
-    phase: check(
-      'project_membership_rollout_phase',
-      sql`${table.phase} IN ('connector', 'column')`
-    ),
-  })
-)
-
 export const workspaceForkResourceTypeEnum = pgEnum('workspace_fork_resource_type', [
   'workflow',
   'oauth_credential',

packages/db/scripts/project-authority.integration.ts

@@ -1,6 +1,7 @@
 import { execFile } from 'node:child_process'
 import { readFile } from 'node:fs/promises'
 import { promisify } from 'node:util'
+import { readProjectMembershipPhase } from '@sim/db/maintenance/project-rollout'
 import { runScriptMigrations, scriptMigrations } from '@sim/db/script-migrations'
 import { readTestDatabaseUrl } from '@sim/db/testing/test-infrastructure'
 import { generateId } from '@sim/utils/id'
@@ -52,7 +53,7 @@ function migrate(sql: Sql) {
 }
 
 async function phase(sql: Sql) {
-  return sql`SELECT phase FROM project_membership_rollout WHERE id = 'membership'`
+  return [{ phase: await readProjectMembershipPhase(sql) }]
 }
 
 describe('Project membership authority cutover', () => {
@@ -66,6 +67,9 @@ describe('Project membership authority cutover', () => {
       })
       await migrate(runner)
       expect(await phase(sql)).toEqual([{ phase: 'column' }])
+      expect(await sql`SELECT to_regclass('public.project_membership_rollout') AS marker`).toEqual([
+        { marker: null },
+      ])
       expect(await sql`SELECT name,project_id FROM workspace`).toEqual([
         { name: 'Legacy write', project_id: 'retained' },
       ])

packages/db/scripts/project-contract.integration.ts

@@ -296,6 +296,9 @@ describe('Project expand/backfill/contract against PostgreSQL', () => {
       expect(await sql`SELECT to_regclass('project_workspace')::text AS connector`).toEqual([
         { connector: null },
       ])
+      expect(await sql`SELECT to_regclass('public.project_membership_rollout') AS marker`).toEqual([
+        { marker: null },
+      ])
       const assignments = await sql`SELECT id,project_id FROM workspace ORDER BY id`
       await runRegisteredProjectMigration(url)
       expect(await sql`SELECT id,project_id FROM workspace ORDER BY id`).toEqual(assignments)
@@ -1215,6 +1218,9 @@ describe('Project expand/backfill/contract against PostgreSQL', () => {
           expect(await sql`SELECT to_regclass('project_workspace')::text AS connector`).toEqual([
             { connector: null },
           ])
+          expect(
+            await sql`SELECT to_regclass('public.project_membership_rollout') AS marker`
+          ).toEqual([{ marker: null }])
           expect(await sql`SELECT * FROM script_migrations`).toHaveLength(0)
           await expect(
             sql`INSERT INTO workspace (id,name,owner_id) VALUES ('bad','Bad','owner')`

packages/db/scripts/push.integration.ts

@@ -223,10 +223,7 @@ export const knowledgeBases = pgTable('knowledge_base', {
         await sql`ALTER TABLE workspace ADD COLUMN project_id text`
         await sql`UPDATE workspace SET project_id = 'retained'`
       }
-      await schema(`export const rollout = pgTable('project_membership_rollout', {
-  id: text('id').primaryKey(), phase: text('phase').notNull().default('connector'),
-}, (t) => [check('project_membership_rollout_singleton', sql\`\${t.id} = 'membership'\`), check('project_membership_rollout_phase', sql\`\${t.phase} IN ('connector', 'column')\`)])
-export const projects = pgTable('project', { id: text('id').primaryKey() })
+      await schema(`export const projects = pgTable('project', { id: text('id').primaryKey() })
 export const workspaces = pgTable('workspace', { id: text('id').primaryKey(), projectId: text('project_id').notNull() })`)
       const result = runPush(['--force'])
       expect(result.error).toBeUndefined()
@@ -259,10 +256,7 @@ export const workspaces = pgTable('workspace', { id: text('id').primaryKey(), pr
       expect(result.error).toBeUndefined()
       expect(result.status, result.stdout + result.stderr).toBe(0)
     }
-    await schema(`export const rollout = pgTable('project_membership_rollout', {
-  id: text('id').primaryKey(), phase: text('phase').notNull().default('connector'),
-}, (t) => [check('project_membership_rollout_singleton', sql\`\${t.id} = 'membership'\`), check('project_membership_rollout_phase', sql\`\${t.phase} IN ('connector', 'column')\`)])
-export const projects = pgTable('project', {
+    await schema(`export const projects = pgTable('project', {
   id: text('id').primaryKey(), name: text('name').notNull(), ownerId: text('owner_id').notNull(),
   organizationScopeKey: text('organization_scope_key').generatedAlwaysAs(sql\`CASE WHEN organization_id IS NULL THEN 'personal' ELSE 'organization:' || organization_id END\`),
   organizationId: text('organization_id'), archivedAt: timestamp('archived_at'), updatedAt: timestamp('updated_at').notNull().defaultNow(),
@@ -284,8 +278,8 @@ export const workflows = pgTable('workflow', {
     expect(first.error, first.stderr).toBeUndefined()
     expect(first.status, first.stdout + first.stderr).toBe(0)
     reconcileProjects()
-    expect(await sql`SELECT id, phase FROM project_membership_rollout`).toEqual([
-      { id: 'membership', phase: 'column' },
+    expect(await sql`SELECT to_regclass('public.project_membership_rollout') AS marker`).toEqual([
+      { marker: null },
     ])
     await sql`INSERT INTO project (id,name,owner_id) VALUES ('empty','Empty','owner')`
     await sql`DELETE FROM project WHERE id = 'empty'`
@@ -297,7 +291,9 @@ export const workflows = pgTable('workflow', {
     expect(repeated.error, repeated.stderr).toBeUndefined()
     expect(repeated.status, repeated.stdout + repeated.stderr).toBe(0)
     reconcileProjects()
-    expect(await sql`SELECT phase FROM project_membership_rollout`).toEqual([{ phase: 'column' }])
+    expect(await sql`SELECT to_regclass('public.project_membership_rollout') AS marker`).toEqual([
+      { marker: null },
+    ])
     expect(await sql`SELECT id,project_id FROM workspace ORDER BY id`).toEqual([
       { id: 'fork', project_id: 'family' },
       { id: 'root', project_id: 'family' },

packages/db/scripts/reconcile-project-membership.ts

@@ -1,5 +1,4 @@
 import { enforceProjectMembership } from '@sim/db/maintenance/project-enforcement'
-import { bootstrapProjectColumnAuthority } from '@sim/db/maintenance/project-rollout'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage, getPostgresErrorCode } from '@sim/utils/errors'
 import postgres from 'postgres'
@@ -24,10 +23,9 @@ try {
     )
   }
   if (!process.argv.includes('--prepare') && state.workspace && state.project) {
-    // Drizzle cannot express lifecycle triggers; fresh push uses the same enforcement as migrations.
-    await bootstrapProjectColumnAuthority(sql)
+    /** Drizzle cannot express deferred FK timing; fresh push shares the migration finalizer. */
     await enforceProjectMembership(sql)
-    logger.info('Project membership validation and lifecycle enforcement completed')
+    logger.info('Project membership validation and native constraints completed')
   }
 } catch (error) {
   logger.error('Project schema push stopped; resolve the error and retry', {

packages/testing/src/mocks/database.mock.ts

@@ -151,10 +151,6 @@ function dequeueChainRows(tables: unknown[]): unknown[] | null {
     const queue = tableRowQueues.get(table)
     if (queue && queue.length > 0) return queue.shift() ?? null
   }
-  /** Default unit fixtures represent a migrated database after authority cutover. */
-  if (tables.includes(schemaMock.projectMembershipRollout)) {
-    return [{ id: 'membership', phase: 'column' }]
-  }
   return null
 }
 
@@ -244,18 +240,7 @@ const update = chainSpy()
 const set = chainSpy()
 const del = chainSpy()
 const returning = vi.fn(() => Promise.resolve([] as unknown[]))
-const execute = vi.fn((statement?: unknown) => {
-  if (
-    statement &&
-    typeof statement === 'object' &&
-    'toSQL' in statement &&
-    typeof statement.toSQL === 'function' &&
-    statement.toSQL().sql.includes("to_regclass('public.project_membership_rollout')")
-  ) {
-    return Promise.resolve([{ marker: true, complete: false }] as unknown[])
-  }
-  return Promise.resolve([] as unknown[])
-})
+const execute = vi.fn(() => Promise.resolve([] as unknown[]))
 const query = vi.fn(() => Promise.resolve([] as unknown[]))
 const onConflictDoUpdate = vi.fn(() => ({ returning }) as unknown as Promise<void>)
 const onConflictDoNothing = vi.fn(() => ({ returning }) as unknown as Promise<void>)

packages/testing/src/mocks/schema-tables.generated.ts

@@ -517,7 +517,6 @@ export const GENERATED_SCHEMA_TABLES = {
     'createdAt',
     'updatedAt',
   ],
-  projectMembershipRollout: ['id', 'phase'],
   workspaceForkResourceMap: [
     'id',
     'childWorkspaceId',