fix(projects): correct rollout fixtures and schema-push index

Author: mzxchandra

apps/sim/lib/projects/__integration__/foundation.integration.ts

@@ -207,17 +207,18 @@ async function fixture(org = true, count = 2) {
 
 /**
  * Waits until the operation under test is blocked behind `blockerPid`: a session whose
- * current statement contains `waitingIn` (an advisory lock tag or row-lock clause), so an
- * unrelated waiter cannot release the barrier early.
+ * current statement contains `waitingIn` (an advisory lock tag or row-lock clause).
+ * When the caller owns the transaction, `waitingPid` identifies that exact backend.
  */
-async function waitUntilBlockedBy(blockerPid: number, waitingIn: string) {
+async function waitUntilBlockedBy(blockerPid: number, waitingIn: string, waitingPid?: number) {
   await expect
     .poll(
       async () =>
         (
           await db.execute(sql`
             SELECT 1 FROM pg_stat_activity
-            WHERE ${blockerPid} = ANY(pg_blocking_pids(pid))
+            WHERE ${waitingPid === undefined ? sql`true` : sql`pid = ${waitingPid}`}
+              AND ${blockerPid} = ANY(pg_blocking_pids(pid))
               AND position(${waitingIn.toLowerCase()} in lower(query)) > 0
           `)
         ).length,
@@ -1394,14 +1395,22 @@ describe('Project foundation at the database and application boundary', () => {
         )
       })
       const blocker = await held.promise
+      const detachPid = createDeferred<number>()
       const detach = db
-        .transaction((tx) => splitForkProject(tx, f.ids[1]))
+        .transaction(async (tx) => {
+          const [backend] = await tx.execute<{ pid: number }>(sql`SELECT pg_backend_pid() AS pid`)
+          detachPid.resolve(backend.pid)
+          return splitForkProject(tx, f.ids[1])
+        })
         .then(
           () => null,
-          (error: unknown) => error
+          (error: unknown) => {
+            detachPid.reject(error)
+            return error
+          }
         )
       try {
-        await waitUntilBlockedBy(blocker, "lock='project'")
+        await waitUntilBlockedBy(blocker, "lock='project'", await detachPid.promise)
       } finally {
         release.resolve()
         await legacy

apps/sim/lib/workspaces/organization-workspaces.integration.ts

@@ -43,10 +43,16 @@ beforeAll(async () => {
     CREATE TABLE workspace (
       id text PRIMARY KEY, name text, owner_id text, organization_id text, workspace_mode text,
       project_id text NOT NULL REFERENCES project(id) ON DELETE RESTRICT,
+      forked_from_workspace_id text,
       billed_account_user_id text, allow_personal_api_keys boolean DEFAULT true,
       archived_at timestamp, organization_assigned_at timestamp, updated_at timestamp,
       storage_used_bytes bigint NOT NULL
     );
+    CREATE TABLE project_workspace (
+      project_id text NOT NULL REFERENCES project(id) ON DELETE RESTRICT,
+      workspace_id text NOT NULL UNIQUE REFERENCES workspace(id) ON DELETE CASCADE,
+      PRIMARY KEY (project_id, workspace_id)
+    );
     CREATE TABLE permissions (
       id text PRIMARY KEY, user_id text, entity_type text, entity_id text, permission_type text,
       created_at timestamp, updated_at timestamp, UNIQUE(user_id, entity_type, entity_id)
@@ -64,7 +70,7 @@ beforeAll(async () => {
 
 beforeEach(async () => {
   await connection.unsafe(`
-    TRUNCATE member, organization, project, permission_group, invitation, user_stats, workspace, permissions,
+    TRUNCATE member, organization, project, project_workspace, permission_group, invitation, user_stats, workspace, permissions,
       workspace_files, knowledge_base, document, knowledge_connector;
     INSERT INTO member VALUES ('owner-membership', 'org', 'org-owner', 'owner');
     INSERT INTO organization VALUES ('org', 40);

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

@@ -27101,7 +27101,7 @@
             }
           ],
           "isUnique": false,
-          "concurrently": false,
+          "concurrently": true,
           "method": "btree",
           "with": {}
         },

packages/db/schema.ts

@@ -2061,7 +2061,7 @@ export const workspace = pgTable(
   (table) => ({
     ownerIdIdx: index('workspace_owner_id_idx').on(table.ownerId),
     organizationIdIdx: index('workspace_organization_id_idx').on(table.organizationId),
-    projectIdIdx: index('workspace_project_id_id_idx').on(table.projectId, table.id),
+    projectIdIdx: index('workspace_project_id_id_idx').on(table.projectId, table.id).concurrently(),
     nonNegativeStorage: check(
       'workspace_storage_used_bytes_non_negative',
       sql`${table.storageUsedBytes} >= 0`

packages/db/scripts/push.integration.ts

@@ -195,7 +195,7 @@ export const knowledgeBases = pgTable('knowledge_base', {
     await schema(`export const projects = pgTable('project', { id: text('id').primaryKey() })
 export const workspaces = pgTable('workspace', {
   id: text('id').primaryKey(), forkedFromWorkspaceId: text('forked_from_workspace_id'), projectId: text('project_id'),
-}, (table) => [index('workspace_project_id_id_idx').on(table.projectId, table.id)])
+}, (table) => [index('workspace_project_id_id_idx').on(table.projectId, table.id).concurrently()])
 export const memberships = pgTable('project_workspace', {
   projectId: text('project_id').notNull(), workspaceId: text('workspace_id').notNull().unique(),
 })`)