mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 11:25:06 +03: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? Refactor + bug fixes (part of the SafeSql migration stack — PR 2 of 7, stacks on top of #45897). ## What is the current behavior? - `pgMeta.columns.create` and the table-editor SQL builder take column type as a string with array suffix and schema baked in (e.g. `'private.test_enum'`, `'int4[]'`). - The studio table-editor SQL emits the legacy schema-embedded `format` string for enums in non-public schemas, while the pg-meta columns SQL already returns the new shape (bare `format` + separate `format_schema`). The two queries disagree on how to represent the same column, surfacing as a false-positive type mismatch in the FK selector when both ends are an enum from a non-public schema. - The FK selector compares column types by `format` alone — same-named enums in different schemas appear equal, and arrays vs. scalars of the same base type pass the family check. - `displayColumnType` renders arrays as the raw `_typname` pg-meta emits (e.g. `_int4` instead of `int4[]`). ## What is the new behavior? **pg-meta** - Introduce `ColumnTypeRef` (`{ schema?, name, isArray? }`) for column type input, replacing the legacy string-with-array-suffix format. `pgMeta.columns.create` and the table-editor SQL builder consume the new shape. - Add `format_schema` to the column zod schema; pg-meta SQL emits the type's schema for the table editor's ColumnType dropdown. - `pgMeta.columns.create` returns a `SafeSqlFragment`. - Studio table-editor SQL now emits bare `format` + `format_schema`, matching pg-meta's columns SQL. **Studio** - `SafePostgresColumn`/`SafePostgresTable` extend the new `PG*` types (master dropped postgres-meta). - Pipe `ColumnTypeRef` through `SidePanelEditor` → `ColumnEditor` → `TableEditor`, along with the column-create mutation, table retrieve/list queries, and the `TableList`/`ColumnList` surfaces. - `displayColumnType` helper renders arrays as `type[]` (or `schema.type[]`) and handles non-implicit schemas. - FK selector now carries `sourceIsArray`/`targetIsArray` and compares the full `(format, format_schema, isArray)` triple. Family checks for numeric/text/uuid skip when either side is an array (FKs across array boundaries are never compatible). - Type-mismatch and type-notice alerts pass `isArray` to the display helper. - Bundle `Policies.utils` + `Policies.types` + `sql-policy-mutation`, `PolicyEditorModal`, and `SchemaGraph` here because `SidePanelEditor` consumes `acceptGeneratedPolicy`/`AcceptedGeneratedPolicy` — splitting requires temporary overloads with no architectural payoff. ## Additional context Part of the SafeSql migration stack. Stacks on top of #45897. ### Manual test checklist Surfaces touched by this PR — please exercise each: **Table editor** - [x] Create a new table with a mix of column types (scalar, array, enum, foreign key) - [x] Add a column to an existing table; verify the type dropdown lists scalars + arrays separately and shows schema-qualified names for non-public enums - [x] Edit an existing column's type (scalar ↔ array, switch between enums in different schemas) and save - [x] Verify enum types from a non-public schema (e.g. `private.my_enum`) display as `private.my_enum` in the column list **Foreign key selector** - [x] Open the FK selector for a column and pick a target column with a matching type — no mismatch warning - [x] Pick a target column whose type differs only by schema (two same-named enums in different schemas) — should show a type-mismatch alert - [x] Pick a target column where one side is an array and the other is a scalar of the same base type — should show a type-mismatch alert (no auto-cast across array boundary) - [x] When FK target sets the column type, verify `format_schema` and `isArray` are preserved on the source column - [x] Type-mismatch and type-notice alert messages render array types as `type[]` (not `_type`) **Column list / table list** - [x] Schema-qualified type names display correctly for columns whose type lives in a non-public schema - [x] Array columns display as `type[]` (or `schema.type[]`) **Policies (bundled due to import dependency)** - [x] Open the Policies page; create/edit/delete a row-level policy via the modal - [x] Generate a policy via the AI assistant and accept it through `SidePanelEditor` — verify the accepted policy lands in the editor correctly **Schema visualizer** - [x] Open the Schemas → Schema Visualizer page; verify it renders without type errors and shows tables/relationships <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Improvements** * Support for column types in non-public schemas and richer column type presentation (includes schema and array info). * Stronger SQL safety around policies and constraints; draft policy SQL is now promoted explicitly on save. * Improved foreign-key type validation and compatibility checks using enhanced type metadata. * **Tests** * Updated snapshots and tests to reflect new column metadata and SQL fragment handling. <!-- review_stack_entry_start --> [](https://app.coderabbit.ai/change-stack/supabase/supabase/pull/45903) <!-- review_stack_entry_end --> <!-- end of auto-generated comment: release notes by coderabbit.ai -->
382 lines
11 KiB
TypeScript
382 lines
11 KiB
TypeScript
import * as Sentry from '@sentry/nextjs'
|
|
import type { PGColumn } from '@supabase/pg-meta'
|
|
import { useConstant } from 'common'
|
|
import { createContext, PropsWithChildren, useContext } from 'react'
|
|
import { proxy, useSnapshot } from 'valtio'
|
|
|
|
import {
|
|
NewQueuedOperation,
|
|
QueuedOperationType,
|
|
type OperationQueueState,
|
|
type QueueStatus,
|
|
} from './table-editor-operation-queue.types'
|
|
import type { SupaRow } from '@/components/grid/types'
|
|
import {
|
|
resolveDeleteRowConflicts,
|
|
resolveEditCellConflicts,
|
|
upsertOperation,
|
|
} from '@/components/grid/utils/queueConflictResolution'
|
|
import { generateTableChangeKey } from '@/components/grid/utils/queueOperationUtils'
|
|
import { ForeignKey } from '@/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.types'
|
|
import type { EditValue } from '@/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.types'
|
|
import type { TableField } from '@/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.types'
|
|
import type { SafePostgresColumn } from '@/lib/postgres-types'
|
|
import type { Dictionary } from '@/types'
|
|
|
|
export const TABLE_EDITOR_DEFAULT_ROWS_PER_PAGE = 100
|
|
|
|
type ForeignKeyState = {
|
|
foreignKey: ForeignKey
|
|
row: Dictionary<any>
|
|
column: PGColumn
|
|
}
|
|
|
|
export type SidePanel =
|
|
| { type: 'cell'; value?: { column: string; row: Dictionary<any> } }
|
|
| { type: 'row'; row?: Dictionary<any> }
|
|
| { type: 'column'; column?: SafePostgresColumn }
|
|
| { type: 'table'; mode: 'new' | 'edit' | 'duplicate'; templateData?: Partial<TableField> }
|
|
| { type: 'schema'; mode: 'new' | 'edit' }
|
|
| { type: 'json'; jsonValue: EditValue }
|
|
| {
|
|
type: 'foreign-row-selector'
|
|
foreignKey: ForeignKeyState
|
|
}
|
|
| { type: 'csv-import'; file?: File }
|
|
| { type: 'operation-queue' }
|
|
|
|
export type ConfirmationDialog =
|
|
| { type: 'table'; isDeleteWithCascade: boolean }
|
|
| { type: 'column'; column: SafePostgresColumn; isDeleteWithCascade: boolean }
|
|
// [Joshen] Just FYI callback, numRows, allRowsSelected is a temp workaround so that
|
|
// DeleteConfirmationDialog can trigger dispatch methods after the successful deletion of rows.
|
|
// Once we deprecate react tracked and move things to valtio, we can remove this.
|
|
| {
|
|
type: 'row'
|
|
rows: SupaRow[]
|
|
numRows?: number
|
|
allRowsSelected?: boolean
|
|
callback?: () => void
|
|
}
|
|
|
|
export type UIState =
|
|
| {
|
|
open: 'none'
|
|
}
|
|
| {
|
|
open: 'side-panel'
|
|
sidePanel: SidePanel
|
|
}
|
|
| {
|
|
open: 'confirmation-dialog'
|
|
confirmationDialog: ConfirmationDialog
|
|
}
|
|
|
|
/**
|
|
* Global table editor state for the table editor across multiple tables.
|
|
* See ./table-editor-table.tsx for table specific state.
|
|
*/
|
|
export const createTableEditorState = () => {
|
|
const state = proxy({
|
|
rowsPerPage: TABLE_EDITOR_DEFAULT_ROWS_PER_PAGE,
|
|
setRowsPerPage: (rowsPerPage: number) => {
|
|
state.rowsPerPage = rowsPerPage
|
|
},
|
|
|
|
ui: { open: 'none' } as UIState,
|
|
get sidePanel() {
|
|
return state.ui.open === 'side-panel' ? state.ui.sidePanel : undefined
|
|
},
|
|
get confirmationDialog() {
|
|
return state.ui.open === 'confirmation-dialog' ? state.ui.confirmationDialog : undefined
|
|
},
|
|
|
|
closeSidePanel: () => {
|
|
state.ui = { open: 'none' }
|
|
},
|
|
closeConfirmationDialog: () => {
|
|
state.ui = { open: 'none' }
|
|
},
|
|
|
|
onAddSchema: () => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'schema', mode: 'new' },
|
|
}
|
|
},
|
|
|
|
/* Tables */
|
|
onAddTable: (templateData?: Partial<TableField>) => {
|
|
// Record that the table creator was opened
|
|
Sentry.startSpan({ name: 'table_creator.opened', op: 'ui.action' }, (span) => {
|
|
span.setAttribute('table_creator.opened', 1)
|
|
})
|
|
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'table', mode: 'new', templateData },
|
|
}
|
|
},
|
|
onEditTable: () => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'table', mode: 'edit' },
|
|
}
|
|
},
|
|
onDuplicateTable: () => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'table', mode: 'duplicate' },
|
|
}
|
|
},
|
|
onDeleteTable: () => {
|
|
state.ui = {
|
|
open: 'confirmation-dialog',
|
|
confirmationDialog: { type: 'table', isDeleteWithCascade: false },
|
|
}
|
|
},
|
|
|
|
/* Columns */
|
|
onAddColumn: () => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'column' },
|
|
}
|
|
},
|
|
onEditColumn: (column: SafePostgresColumn) => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'column', column },
|
|
}
|
|
},
|
|
onDeleteColumn: (column: SafePostgresColumn) => {
|
|
state.ui = {
|
|
open: 'confirmation-dialog',
|
|
confirmationDialog: { type: 'column', column, isDeleteWithCascade: false },
|
|
}
|
|
},
|
|
|
|
/* Rows */
|
|
onAddRow: () => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'row' },
|
|
}
|
|
},
|
|
onEditRow: (row: Dictionary<any>) => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'row', row },
|
|
}
|
|
},
|
|
onDeleteRows: (
|
|
rows: SupaRow[],
|
|
meta: { numRows?: number; allRowsSelected: boolean; callback?: () => void } = {
|
|
numRows: 0,
|
|
allRowsSelected: false,
|
|
callback: () => {},
|
|
}
|
|
) => {
|
|
const { numRows, allRowsSelected, callback } = meta
|
|
state.ui = {
|
|
open: 'confirmation-dialog',
|
|
confirmationDialog: { type: 'row', rows, numRows, allRowsSelected, callback },
|
|
}
|
|
},
|
|
|
|
/* Misc */
|
|
onExpandJSONEditor: (jsonValue: EditValue) => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'json', jsonValue },
|
|
}
|
|
},
|
|
onExpandTextEditor: (column: string, row: Dictionary<any>) => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'cell', value: { column, row } },
|
|
}
|
|
},
|
|
onEditForeignKeyColumnValue: (foreignKey: ForeignKeyState) => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'foreign-row-selector', foreignKey },
|
|
}
|
|
},
|
|
onImportData: (file?: File) => {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'csv-import', file },
|
|
}
|
|
},
|
|
toggleViewOperationQueue: () => {
|
|
if (state.ui.open === 'side-panel' && state.ui.sidePanel.type === 'operation-queue') {
|
|
state.closeSidePanel()
|
|
} else {
|
|
state.ui = {
|
|
open: 'side-panel',
|
|
sidePanel: { type: 'operation-queue' },
|
|
}
|
|
}
|
|
},
|
|
|
|
/* Utils */
|
|
toggleConfirmationIsWithCascade: (overrideIsDeleteWithCascade?: boolean) => {
|
|
if (
|
|
state.ui.open === 'confirmation-dialog' &&
|
|
(state.ui.confirmationDialog.type === 'column' ||
|
|
state.ui.confirmationDialog.type === 'table')
|
|
) {
|
|
state.ui.confirmationDialog.isDeleteWithCascade =
|
|
overrideIsDeleteWithCascade ?? !state.ui.confirmationDialog.isDeleteWithCascade
|
|
}
|
|
},
|
|
|
|
// ========================================================================
|
|
// Operation Queue
|
|
// ========================================================================
|
|
|
|
operationQueue: {
|
|
operations: [],
|
|
status: 'idle',
|
|
} as OperationQueueState,
|
|
|
|
/**
|
|
* Queue a new operation for later processing.
|
|
* If an operation with the same key already exists, it will be overwritten.
|
|
* Handles conflict resolution:
|
|
* - DELETE_ROW on a row: remove any pending EDIT_CELL ops for that row
|
|
* - EDIT_CELL on a row pending deletion: reject (console.warn)
|
|
* - EDIT_CELL on a newly added row: merge edit into ADD_ROW's rowData
|
|
* - DELETE_ROW on a newly added row: cancel both operations
|
|
*/
|
|
queueOperation: (operation: NewQueuedOperation) => {
|
|
const updateQueueStatus = () => {
|
|
if (state.operationQueue.operations.length === 0) {
|
|
state.operationQueue.status = 'idle'
|
|
} else if (state.operationQueue.status === 'idle') {
|
|
state.operationQueue.status = 'pending'
|
|
}
|
|
}
|
|
|
|
// Handle DELETE_ROW conflicts
|
|
if (operation.type === QueuedOperationType.DELETE_ROW) {
|
|
const result = resolveDeleteRowConflicts(state.operationQueue.operations, operation)
|
|
state.operationQueue.operations = result.filteredOperations
|
|
if (result.action === 'skip') {
|
|
updateQueueStatus()
|
|
return
|
|
}
|
|
}
|
|
|
|
// Handle EDIT_CELL_CONTENT conflicts
|
|
if (operation.type === QueuedOperationType.EDIT_CELL_CONTENT) {
|
|
const result = resolveEditCellConflicts(state.operationQueue.operations, operation)
|
|
if (result.action === 'reject') {
|
|
console.warn(result.reason)
|
|
return
|
|
}
|
|
if (result.action === 'merge') {
|
|
state.operationQueue.operations = result.updatedOperations
|
|
updateQueueStatus()
|
|
return
|
|
}
|
|
}
|
|
|
|
// Normal upsert
|
|
const { operations } = upsertOperation(state.operationQueue.operations, operation)
|
|
state.operationQueue.operations = operations
|
|
updateQueueStatus()
|
|
},
|
|
|
|
/**
|
|
* Clear all operations from the queue
|
|
*/
|
|
clearQueue: () => {
|
|
state.operationQueue.operations = []
|
|
state.operationQueue.status = 'idle'
|
|
},
|
|
|
|
/**
|
|
* Remove a specific operation from the queue
|
|
*/
|
|
removeOperation: (operationId: string) => {
|
|
state.operationQueue.operations = state.operationQueue.operations.filter(
|
|
(op) => op.id !== operationId
|
|
)
|
|
if (state.operationQueue.operations.length === 0) {
|
|
state.operationQueue.status = 'idle'
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Undo the latest operation from the queue
|
|
*/
|
|
undoLatestOperation: () => {
|
|
state.operationQueue.operations = state.operationQueue.operations.slice(0, -1)
|
|
if (state.operationQueue.operations.length === 0) {
|
|
state.operationQueue.status = 'idle'
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Update the queue status
|
|
*/
|
|
setQueueStatus: (status: QueueStatus) => {
|
|
state.operationQueue.status = status
|
|
},
|
|
|
|
/**
|
|
* Check if there are any pending operations in the queue
|
|
*/
|
|
get hasPendingOperations(): boolean {
|
|
return state.operationQueue.operations.length > 0
|
|
},
|
|
|
|
hasPendingCellChange: (
|
|
tableId: number,
|
|
rowIdentifiers: Dictionary<unknown>,
|
|
columnName: string
|
|
): boolean => {
|
|
const key = generateTableChangeKey({
|
|
type: QueuedOperationType.EDIT_CELL_CONTENT,
|
|
tableId,
|
|
payload: {
|
|
columnName,
|
|
rowIdentifiers,
|
|
},
|
|
})
|
|
return state.operationQueue.operations.some((op) => op.id === key)
|
|
},
|
|
|
|
/**
|
|
* Toggle the preflight check behaviour for each table
|
|
*/
|
|
tablesToIgnorePreflightCheck: [] as number[],
|
|
setTableToIgnorePreflightCheck: (id: number) => {
|
|
const set = new Set<number>(state.tablesToIgnorePreflightCheck)
|
|
set.add(id)
|
|
state.tablesToIgnorePreflightCheck = [...set]
|
|
},
|
|
})
|
|
|
|
return state
|
|
}
|
|
|
|
export type TableEditorState = ReturnType<typeof createTableEditorState>
|
|
|
|
export const TableEditorStateContext = createContext<TableEditorState>(createTableEditorState())
|
|
|
|
export const TableEditorStateContextProvider = ({ children }: PropsWithChildren<{}>) => {
|
|
const state = useConstant(createTableEditorState)
|
|
|
|
return (
|
|
<TableEditorStateContext.Provider value={state}>{children}</TableEditorStateContext.Provider>
|
|
)
|
|
}
|
|
|
|
export const useTableEditorStateSnapshot = (options?: Parameters<typeof useSnapshot>[1]) => {
|
|
const state = useContext(TableEditorStateContext)
|
|
return useSnapshot(state, options)
|
|
}
|