Fix table column delete

Author: Sg312

apps/sim/lib/copilot/tools/server/table/user-table.ts

@@ -6,6 +6,7 @@ import {
   batchInsertRows,
   createTable,
   deleteColumn,
+  deleteColumns,
   deleteRow,
   deleteRowsByFilter,
   deleteTable,
@@ -695,17 +696,30 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: 'Table ID is required' }
           }
           const colName = (args as Record<string, unknown>).columnName as string | undefined
-          if (!colName) {
-            return { success: false, message: 'columnName is required' }
+          const colNames = (args as Record<string, unknown>).columnNames as string[] | undefined
+          const names = colNames ?? (colName ? [colName] : null)
+          if (!names || names.length === 0) {
+            return { success: false, message: 'columnName or columnNames is required' }
           }
           const requestId = crypto.randomUUID().slice(0, 8)
-          const updated = await deleteColumn(
-            { tableId: args.tableId, columnName: colName },
+          if (names.length === 1) {
+            const updated = await deleteColumn(
+              { tableId: args.tableId, columnName: names[0] },
+              requestId
+            )
+            return {
+              success: true,
+              message: `Deleted column "${names[0]}"`,
+              data: { schema: updated.schema },
+            }
+          }
+          const updated = await deleteColumns(
+            { tableId: args.tableId, columnNames: names },
             requestId
           )
           return {
             success: true,
-            message: `Deleted column "${colName}"`,
+            message: `Deleted ${names.length} columns: ${names.join(', ')}`,
             data: { schema: updated.schema },
           }
         }

apps/sim/lib/copilot/tools/shared/schemas.ts

@@ -149,6 +149,7 @@ export const UserTableArgsSchema = z.object({
         })
         .optional(),
       columnName: z.string().optional(),
+      columnNames: z.array(z.string()).optional(),
       newName: z.string().optional(),
       newType: z.string().optional(),
       unique: z.boolean().optional(),

apps/sim/lib/table/service.ts

@@ -1368,6 +1368,73 @@ export async function deleteColumn(
   return { ...table, schema: updatedSchema, metadata: updatedMetadata, updatedAt: now }
 }
 
+/**
+ * Deletes multiple columns from a table in a single transaction.
+ * Avoids the race condition of calling deleteColumn multiple times in parallel.
+ */
+export async function deleteColumns(
+  data: { tableId: string; columnNames: string[] },
+  requestId: string
+): Promise<TableDefinition> {
+  const table = await getTableById(data.tableId)
+  if (!table) {
+    throw new Error('Table not found')
+  }
+
+  const schema = table.schema
+  const namesToDelete = new Set<string>()
+  const notFound: string[] = []
+
+  for (const name of data.columnNames) {
+    const col = schema.columns.find((c) => c.name.toLowerCase() === name.toLowerCase())
+    if (!col) {
+      notFound.push(name)
+    } else {
+      namesToDelete.add(col.name)
+    }
+  }
+
+  if (notFound.length > 0) {
+    throw new Error(`Columns not found: ${notFound.join(', ')}`)
+  }
+
+  const remaining = schema.columns.filter((c) => !namesToDelete.has(c.name))
+  if (remaining.length === 0) {
+    throw new Error('Cannot delete all columns from a table')
+  }
+
+  const updatedSchema: TableSchema = { columns: remaining }
+
+  const metadata = table.metadata as TableMetadata | null
+  let updatedMetadata = metadata
+  if (metadata?.columnWidths) {
+    const widths = { ...metadata.columnWidths }
+    for (const n of namesToDelete) delete widths[n]
+    updatedMetadata = { ...metadata, columnWidths: widths }
+  }
+
+  const now = new Date()
+
+  await db.transaction(async (trx) => {
+    await trx
+      .update(userTableDefinitions)
+      .set({ schema: updatedSchema, metadata: updatedMetadata, updatedAt: now })
+      .where(eq(userTableDefinitions.id, data.tableId))
+
+    for (const name of namesToDelete) {
+      await trx.execute(
+        sql`UPDATE user_table_rows SET data = data - ${name} WHERE table_id = ${data.tableId} AND data ? ${name}`
+      )
+    }
+  })
+
+  logger.info(
+    `[${requestId}] Deleted columns [${[...namesToDelete].join(', ')}] from table ${data.tableId}`
+  )
+
+  return { ...table, schema: updatedSchema, metadata: updatedMetadata, updatedAt: now }
+}
+
 /**
  * Changes the type of a column. Validates that existing data is compatible.
  *