mirror of
https://github.com/supabase/supabase.git
synced 2026-10-11 04:15:04 +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 -->
126 lines
3.8 KiB
TypeScript
126 lines
3.8 KiB
TypeScript
import type { PGTable } from '@supabase/pg-meta'
|
|
import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'
|
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
|
import { sortBy } from 'lodash'
|
|
import { useCallback } from 'react'
|
|
|
|
import { tableKeys } from './keys'
|
|
import { get, handleError } from '@/data/fetchers'
|
|
import type { SafePostgresTable } from '@/lib/postgres-types'
|
|
import type { ResponseError, UseCustomQueryOptions } from '@/types'
|
|
|
|
export type TablesVariables = {
|
|
projectRef?: string
|
|
connectionString?: string | null
|
|
schema?: string
|
|
/**
|
|
* Defaults to false
|
|
*/
|
|
includeColumns?: boolean
|
|
sortByProperty?: keyof PGTable
|
|
}
|
|
|
|
export async function getTables(
|
|
{
|
|
projectRef,
|
|
connectionString,
|
|
schema,
|
|
includeColumns = false,
|
|
sortByProperty = 'name',
|
|
}: TablesVariables,
|
|
signal?: AbortSignal
|
|
) {
|
|
if (!projectRef) {
|
|
throw new Error('projectRef is required')
|
|
}
|
|
|
|
let headers = new Headers()
|
|
if (connectionString) headers.set('x-connection-encrypted', connectionString)
|
|
|
|
let queryParams: Record<string, string> = {
|
|
//include_columns is a string, even though it's true or false
|
|
include_columns: `${includeColumns}`,
|
|
}
|
|
if (schema) {
|
|
queryParams.included_schemas = schema
|
|
}
|
|
|
|
const { data, error } = await get('/platform/pg-meta/{ref}/tables', {
|
|
params: {
|
|
header: {
|
|
'x-connection-encrypted': connectionString!,
|
|
'x-pg-application-name': DEFAULT_PLATFORM_APPLICATION_NAME,
|
|
},
|
|
path: { ref: projectRef },
|
|
query: queryParams as any,
|
|
},
|
|
headers,
|
|
signal,
|
|
})
|
|
|
|
if (!Array.isArray(data) && error) handleError(error)
|
|
|
|
// Sort the data if the sortByName option is true
|
|
if (Array.isArray(data) && sortByProperty) {
|
|
return sortBy(data, (t) => t[sortByProperty]) as SafePostgresTable[]
|
|
}
|
|
|
|
return data as SafePostgresTable[]
|
|
}
|
|
|
|
export type TablesData = Awaited<ReturnType<typeof getTables>>
|
|
export type TablesError = ResponseError
|
|
|
|
export const useTablesQuery = <TData = TablesData>(
|
|
{ projectRef, connectionString, schema, includeColumns }: TablesVariables,
|
|
{ enabled = true, ...options }: UseCustomQueryOptions<TablesData, TablesError, TData> = {}
|
|
) => {
|
|
return useQuery<TablesData, TablesError, TData>({
|
|
queryKey: tableKeys.list(projectRef, schema, includeColumns),
|
|
queryFn: ({ signal }) =>
|
|
getTables({ projectRef, connectionString, schema, includeColumns }, signal),
|
|
enabled: enabled && typeof projectRef !== 'undefined',
|
|
...options,
|
|
})
|
|
}
|
|
|
|
/**
|
|
* useGetTables
|
|
* Tries to get tables from the react-query cache, or loads it from the server if it's not cached.
|
|
*/
|
|
export function useGetTables({
|
|
projectRef,
|
|
connectionString,
|
|
}: Pick<TablesVariables, 'projectRef' | 'connectionString'>) {
|
|
const queryClient = useQueryClient()
|
|
|
|
return useCallback(
|
|
(schema?: TablesVariables['schema'], includeColumns?: TablesVariables['includeColumns']) => {
|
|
return queryClient.fetchQuery({
|
|
queryKey: tableKeys.list(projectRef, schema, includeColumns),
|
|
queryFn: ({ signal }) =>
|
|
getTables({ projectRef, connectionString, schema, includeColumns }, signal),
|
|
})
|
|
},
|
|
[connectionString, projectRef, queryClient]
|
|
)
|
|
}
|
|
|
|
export function usePrefetchTables({
|
|
projectRef,
|
|
connectionString,
|
|
}: Pick<TablesVariables, 'projectRef' | 'connectionString'>) {
|
|
const queryClient = useQueryClient()
|
|
|
|
return useCallback(
|
|
(schema?: TablesVariables['schema'], includeColumns?: TablesVariables['includeColumns']) => {
|
|
return queryClient.prefetchQuery({
|
|
queryKey: tableKeys.list(projectRef, schema, includeColumns),
|
|
queryFn: ({ signal }) =>
|
|
getTables({ projectRef, connectionString, schema, includeColumns }, signal),
|
|
})
|
|
},
|
|
[connectionString, projectRef, queryClient]
|
|
)
|
|
}
|