fix(tables): apply type+options atomically in updateColumnType, fix biome format in contract refine

Author: waleedlatif1

apps/sim/app/api/table/[tableId]/columns/route.ts

@@ -119,7 +119,14 @@ export const PATCH = withRouteHandler(async (request: NextRequest, context: Colu
 
     if (updates.type) {
       updatedTable = await updateColumnType(
-        { tableId, columnName: updates.name ?? validated.columnName, newType: updates.type },
+        {
+          tableId,
+          columnName: updates.name ?? validated.columnName,
+          newType: updates.type,
+          // Applied inside updateColumnType's transaction so a combined
+          // type+options change is atomic.
+          ...(updates.options !== undefined ? { options: updates.options } : {}),
+        },
         requestId
       )
     }
@@ -136,7 +143,7 @@ export const PATCH = withRouteHandler(async (request: NextRequest, context: Colu
       )
     }
 
-    if (updates.options !== undefined) {
+    if (updates.options !== undefined && !updates.type) {
       updatedTable = await updateColumnOptions(
         { tableId, columnName: updates.name ?? validated.columnName, options: updates.options },
         requestId

apps/sim/app/api/v1/tables/[tableId]/columns/route.ts

@@ -141,7 +141,14 @@ export const PATCH = withRouteHandler(async (request: NextRequest, context: Colu
 
     if (updates.type) {
       updatedTable = await updateColumnType(
-        { tableId, columnName: updates.name ?? validated.columnName, newType: updates.type },
+        {
+          tableId,
+          columnName: updates.name ?? validated.columnName,
+          newType: updates.type,
+          // Applied inside updateColumnType's transaction so a combined
+          // type+options change is atomic.
+          ...(updates.options !== undefined ? { options: updates.options } : {}),
+        },
         requestId
       )
     }
@@ -158,7 +165,7 @@ export const PATCH = withRouteHandler(async (request: NextRequest, context: Colu
       )
     }
 
-    if (updates.options !== undefined) {
+    if (updates.options !== undefined && !updates.type) {
       updatedTable = await updateColumnOptions(
         { tableId, columnName: updates.name ?? validated.columnName, options: updates.options },
         requestId

apps/sim/lib/api/contracts/tables.ts

@@ -179,8 +179,7 @@ export const updateTableColumnBodySchema = z.object({
       (updates) =>
         updates.options === undefined || updates.type === undefined || updates.type === 'select',
       {
-        message:
-          'options can only be set when the column type is (or is being changed to) select',
+        message: 'options can only be set when the column type is (or is being changed to) select',
         path: ['options'],
       }
     ),

apps/sim/lib/table/service.ts

@@ -4303,44 +4303,55 @@ export async function updateColumnType(
     }
 
     const column = schema.columns[columnIndex]
-    if (column.type === data.newType) {
+    if (column.type === data.newType && data.options === undefined) {
       return table
     }
+
+    if (data.options !== undefined) {
+      const optionsValidation = validateColumnOptions(data.options, column.name, data.newType)
+      if (!optionsValidation.valid) {
+        throw new Error(`Invalid column options: ${optionsValidation.errors.join('; ')}`)
+      }
+    }
+
     const columnKey = getColumnId(column)
 
-    // Validate existing data is compatible with the new type
-    const rows = await trx
-      .select({ id: userTableRows.id, data: userTableRows.data })
-      .from(userTableRows)
-      .where(
-        and(
-          eq(userTableRows.tableId, data.tableId),
-          sql`${userTableRows.data} ? ${columnKey}`,
-          sql`${userTableRows.data}->>${columnKey}::text IS NOT NULL`
+    if (column.type !== data.newType) {
+      // Validate existing data is compatible with the new type
+      const rows = await trx
+        .select({ id: userTableRows.id, data: userTableRows.data })
+        .from(userTableRows)
+        .where(
+          and(
+            eq(userTableRows.tableId, data.tableId),
+            sql`${userTableRows.data} ? ${columnKey}`,
+            sql`${userTableRows.data}->>${columnKey}::text IS NOT NULL`
+          )
         )
-      )
 
-    let incompatibleCount = 0
-    for (const row of rows) {
-      const rowData = row.data as RowData
-      const value = rowData[columnKey]
-      if (value === null || value === undefined) continue
+      let incompatibleCount = 0
+      for (const row of rows) {
+        const rowData = row.data as RowData
+        const value = rowData[columnKey]
+        if (value === null || value === undefined) continue
 
-      if (!isValueCompatibleWithType(value, data.newType)) {
-        incompatibleCount++
+        if (!isValueCompatibleWithType(value, data.newType)) {
+          incompatibleCount++
+        }
       }
-    }
 
-    if (incompatibleCount > 0) {
-      throw new Error(
-        `Cannot change column "${column.name}" to type "${data.newType}": ${incompatibleCount} row(s) have incompatible values. Fix or remove the incompatible values first.`
-      )
+      if (incompatibleCount > 0) {
+        throw new Error(
+          `Cannot change column "${column.name}" to type "${data.newType}": ${incompatibleCount} row(s) have incompatible values. Fix or remove the incompatible values first.`
+        )
+      }
     }
 
     const updatedColumns = schema.columns.map((c, i) => {
       if (i !== columnIndex) return c
       const next = { ...c, type: data.newType }
-      return data.newType === 'select' ? next : omit(next, ['options'])
+      if (data.newType !== 'select') return omit(next, ['options'])
+      return data.options !== undefined ? { ...next, options: data.options } : next
     })
     const updatedSchema: TableSchema = { ...schema, columns: updatedColumns }
     const now = new Date()

apps/sim/lib/table/types.ts

@@ -559,6 +559,11 @@ export interface UpdateColumnTypeData {
   tableId: string
   columnName: string
   newType: (typeof COLUMN_TYPES)[number]
+  /**
+   * Replacement option set applied atomically with the type change (same
+   * locked transaction). Only valid when `newType` is `select`.
+   */
+  options?: string[]
 }
 
 export interface UpdateColumnOptionsData {