mirror of
https://github.com/supabase/supabase.git
synced 2026-09-06 09:59:03 +08:00
## I have read the [CONTRIBUTING.md](https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md) file. YES ## What kind of change does this PR introduce? Bug fix ## What is the current behavior? Fixes #47318 Supabase Studio's batched table edit queue has a few related row identity issues: - Editing a row's primary key can make later queued edits or deletes lose track of the original row. - Editing a primary key and another column in the same row before saving can save only the primary key change, because later updates still use the old primary key in the `WHERE` clause. - Adding a row in batched edit mode and then deleting it before saving may not remove the pending row correctly. ## What is the new behavior? - Preserves the original row identity for queued operations after primary key edits. - Applies multiple queued edits for the same row as a single update when saving. - Correctly deletes newly added pending rows before they are saved. - Adds regression coverage for these batched table edit cases. ## Additional context https://github.com/user-attachments/assets/75672361-d781-4fe5-a542-071574ad57bd <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved row identity handling for grid edits, optimistic updates, and queued operations so changes stay correctly attached when primary keys are edited, reverted, or “taken” by another row. * Updated header row deletion to delete from the currently visible/targeted rows rather than relying on the full dataset. * Reduced retry noise for missing tables by clearing conflicting sorts and preventing repeated retries for the same “does not exist” error. * More reliably consolidated queued edits for the same row into fewer combined save statements. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Ali Waseem <waseema393@gmail.com>
218 lines
7.2 KiB
TypeScript
218 lines
7.2 KiB
TypeScript
import { joinSqlFragments, safeSql, type SafeSqlFragment } from '@supabase/pg-meta'
|
|
import { wrapWithTransaction } from '@supabase/pg-meta/src/query'
|
|
import { useMutation, useQueryClient } from '@tanstack/react-query'
|
|
import { toast } from 'sonner'
|
|
|
|
import { tableRowKeys } from './keys'
|
|
import { getTableRowCreateSql } from './table-row-create-mutation'
|
|
import { getTableRowDeleteSql } from './table-row-delete-mutation'
|
|
import { getTableRowUpdateSql } from './table-row-update-mutation'
|
|
import type { PendingAddRow } from '@/components/grid/types'
|
|
import { executeSql } from '@/data/sql/execute-sql-mutation'
|
|
import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'
|
|
import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'
|
|
import {
|
|
isEditCellContentOperation,
|
|
QueuedOperation,
|
|
QueuedOperationType,
|
|
type EditCellContentOperation,
|
|
} from '@/state/table-editor-operation-queue.types'
|
|
import type { ResponseError, UseCustomMutationOptions } from '@/types'
|
|
|
|
function getEditCellOperationRowKey(operation: EditCellContentOperation): string {
|
|
const rowIdentifiersKey = JSON.stringify(
|
|
Object.entries(operation.payload.rowIdentifiers).sort(([a], [b]) => a.localeCompare(b))
|
|
)
|
|
|
|
return `${operation.tableId}:${rowIdentifiersKey}`
|
|
}
|
|
|
|
export type OperationQueueSaveVariables = {
|
|
projectRef: string
|
|
connectionString?: string | null
|
|
operations: readonly QueuedOperation[]
|
|
roleImpersonationState?: RoleImpersonationState
|
|
}
|
|
|
|
/**
|
|
* Generates SQL for a single queued operation.
|
|
* Extend this function as new operation types are added.
|
|
*/
|
|
function getOperationSql(operation: QueuedOperation): SafeSqlFragment {
|
|
switch (operation.type) {
|
|
case QueuedOperationType.EDIT_CELL_CONTENT: {
|
|
const { payload } = operation
|
|
return getTableRowUpdateSql({
|
|
table: {
|
|
id: payload.table.id,
|
|
name: payload.table.name,
|
|
schema: payload.table.schema,
|
|
},
|
|
configuration: { identifiers: payload.rowIdentifiers },
|
|
payload: { [payload.columnName]: payload.newValue },
|
|
enumArrayColumns: payload.enumArrayColumns ?? [],
|
|
returning: false,
|
|
})
|
|
}
|
|
case QueuedOperationType.ADD_ROW: {
|
|
const { payload } = operation
|
|
// Clean internal fields before SQL generation
|
|
const { __tempId, idx, ...cleanRowData } = payload.rowData as PendingAddRow
|
|
return getTableRowCreateSql({
|
|
table: { id: payload.table.id, name: payload.table.name, schema: payload.table.schema },
|
|
payload: cleanRowData,
|
|
enumArrayColumns: payload.enumArrayColumns ?? [],
|
|
returning: false,
|
|
})
|
|
}
|
|
case QueuedOperationType.DELETE_ROW: {
|
|
const { payload } = operation
|
|
// Create a mock row with the row identifiers for the delete SQL
|
|
const mockRow = { idx: 0, ...payload.rowIdentifiers }
|
|
return getTableRowDeleteSql({
|
|
table: payload.table,
|
|
rows: [mockRow],
|
|
})
|
|
}
|
|
default: {
|
|
// Error should never happen, but we'll handle it anyway. cast to never for exhaustive check.
|
|
const _exhaustiveCheck: never = operation
|
|
throw new Error(`Unknown operation: ${(_exhaustiveCheck as { type: string }).type}`)
|
|
}
|
|
}
|
|
}
|
|
|
|
function sortOperations(operations: readonly QueuedOperation[]): QueuedOperation[] {
|
|
const operationOrder: Record<QueuedOperationType, number> = {
|
|
[QueuedOperationType.DELETE_ROW]: 0,
|
|
[QueuedOperationType.ADD_ROW]: 1,
|
|
[QueuedOperationType.EDIT_CELL_CONTENT]: 2,
|
|
}
|
|
|
|
return [...operations].sort((a, b) => {
|
|
return operationOrder[a.type] - operationOrder[b.type]
|
|
})
|
|
}
|
|
|
|
function stripTrailingSemicolon(sql: SafeSqlFragment): SafeSqlFragment {
|
|
return (sql.endsWith(';') ? sql.slice(0, -1) : sql) as SafeSqlFragment
|
|
}
|
|
|
|
export function getOperationSqlStatements(
|
|
operations: readonly QueuedOperation[]
|
|
): Array<SafeSqlFragment> {
|
|
const statements: Array<SafeSqlFragment> = []
|
|
const editCellOperationsByRow = new Map<string, EditCellContentOperation[]>()
|
|
|
|
for (const operation of sortOperations(operations)) {
|
|
if (!isEditCellContentOperation(operation)) {
|
|
statements.push(stripTrailingSemicolon(getOperationSql(operation)))
|
|
continue
|
|
}
|
|
|
|
const key = getEditCellOperationRowKey(operation)
|
|
const existing = editCellOperationsByRow.get(key)
|
|
if (existing) {
|
|
existing.push(operation)
|
|
continue
|
|
}
|
|
editCellOperationsByRow.set(key, [operation])
|
|
}
|
|
|
|
for (const editCellOperations of editCellOperationsByRow.values()) {
|
|
const firstOperation = editCellOperations[0]
|
|
const { table, rowIdentifiers } = firstOperation.payload
|
|
|
|
statements.push(
|
|
stripTrailingSemicolon(
|
|
getTableRowUpdateSql({
|
|
table: { id: table.id, name: table.name, schema: table.schema },
|
|
configuration: { identifiers: rowIdentifiers },
|
|
payload: Object.fromEntries(
|
|
editCellOperations.map(({ payload }) => [payload.columnName, payload.newValue])
|
|
),
|
|
enumArrayColumns: [
|
|
...new Set(editCellOperations.flatMap(({ payload }) => payload.enumArrayColumns ?? [])),
|
|
],
|
|
returning: false,
|
|
})
|
|
)
|
|
)
|
|
}
|
|
|
|
return statements
|
|
}
|
|
|
|
/**
|
|
* Saves all queued operations in a single database transaction.
|
|
* If any operation fails, the entire transaction is rolled back.
|
|
*/
|
|
export async function saveOperationQueue({
|
|
projectRef,
|
|
connectionString,
|
|
operations,
|
|
roleImpersonationState,
|
|
}: OperationQueueSaveVariables) {
|
|
if (operations.length === 0) {
|
|
return { result: [] }
|
|
}
|
|
|
|
const statements = getOperationSqlStatements(operations)
|
|
|
|
const transactionSql = wrapWithTransaction(safeSql`${joinSqlFragments(statements, ';\n')};`)
|
|
|
|
const sql = wrapWithRoleImpersonation(transactionSql, roleImpersonationState)
|
|
|
|
const { result } = await executeSql({
|
|
projectRef,
|
|
connectionString,
|
|
sql,
|
|
isRoleImpersonationEnabled: isRoleImpersonationEnabled(roleImpersonationState?.role),
|
|
queryKey: ['operation-queue-save'],
|
|
})
|
|
|
|
return { result }
|
|
}
|
|
|
|
type OperationQueueSaveData = Awaited<ReturnType<typeof saveOperationQueue>>
|
|
|
|
export const useOperationQueueSaveMutation = ({
|
|
onSuccess,
|
|
onError,
|
|
...options
|
|
}: Omit<
|
|
UseCustomMutationOptions<OperationQueueSaveData, ResponseError, OperationQueueSaveVariables>,
|
|
'mutationFn'
|
|
> = {}) => {
|
|
const queryClient = useQueryClient()
|
|
|
|
return useMutation<OperationQueueSaveData, ResponseError, OperationQueueSaveVariables>({
|
|
mutationFn: (vars) => saveOperationQueue(vars),
|
|
async onSuccess(data, variables, context) {
|
|
const { projectRef, operations } = variables
|
|
|
|
// Collect all unique table IDs that were affected
|
|
const affectedTableIds = [...new Set(operations.map((op) => op.tableId))]
|
|
|
|
// Invalidate queries for all affected tables (both rows and count)
|
|
await Promise.all(
|
|
affectedTableIds.map((tableId) =>
|
|
queryClient.invalidateQueries({
|
|
queryKey: tableRowKeys.tableRowsAndCount(projectRef, tableId),
|
|
})
|
|
)
|
|
)
|
|
|
|
await onSuccess?.(data, variables, context)
|
|
},
|
|
async onError(data, variables, context) {
|
|
if (onError === undefined) {
|
|
toast.error(`Failed to save changes: ${data.message}`)
|
|
} else {
|
|
onError(data, variables, context)
|
|
}
|
|
},
|
|
...options,
|
|
})
|
|
}
|