mirror of
https://github.com/supabase/supabase.git
synced 2026-07-01 00:34:18 +08:00
## Summary
- pg_graphql 1.6+ disables schema introspection by default, which breaks
GraphiQL's docs explorer and field autocomplete. This PR adds an in-app
notice + confirmation flow so users can opt into (or later opt out of)
introspection without leaving the GraphQL tab.
- Introspection state is read from, and written to, the `@graphql(...)`
directive embedded in the target schema's Postgres comment (`public` by
default). Other directive options the user has set are preserved when
the introspection key is toggled.
- Ships `parseSchemaComment` / `buildSchemaCommentWith` helpers (with
unit tests) and a `useSetIntrospection` mutation hook, plus collapsible
disabled-state and dismissible enabled-state notices rendered above
GraphiQL. GraphiQL is re-mounted after a toggle so it re-runs
introspection.
## Test plan
- [ ] On a project with pg_graphql >= 1.6 and introspection disabled:
disabled-state notice appears, confirm modal shows the SQL that will
run, enabling re-mounts GraphiQL and populates the docs explorer.
- [ ] On a project with introspection enabled: small enabled-state
banner appears, disabling clears the docs explorer and updates the
schema comment.
- [ ] Existing `@graphql({...})` options (e.g. `inflect_names`,
`max_rows`) survive a toggle; malformed directive text is replaced and a
warning is shown in the confirm modal.
- [ ] On pg_graphql < 1.6 (or extension not installed): no notice
renders, GraphiQL behaves as before.
- [ ] Collapsed-disabled-notice state persists per project via local
storage.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **New Features**
* GraphQL introspection toggle with enable/disable confirmation modal.
* Notices showing current introspection state with controls to change
it.
* GraphiQL automatically remounts and updates when introspection status
changes.
* Per-project persisted collapsed/expanded state for the introspection
notice.
* Background detection of introspection support and schema comment
handling for targeted schemas.
* **Tests**
* Comprehensive tests for parsing/building schema comment directives and
version behavior.
<!-- review_stack_entry_start -->
[](https://app.coderabbit.ai/change-stack/supabase/supabase/pull/46170?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)
<!-- review_stack_entry_end -->
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
58 lines
1.9 KiB
TypeScript
58 lines
1.9 KiB
TypeScript
import { literal, safeSql } from '@supabase/pg-meta'
|
|
import { useQuery } from '@tanstack/react-query'
|
|
|
|
import { pgGraphqlKeys } from './keys'
|
|
import { executeSql } from '@/data/sql/execute-sql-query'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { PROJECT_STATUS } from '@/lib/constants'
|
|
import type { UseCustomQueryOptions } from '@/types'
|
|
|
|
export type SchemaCommentVariables = {
|
|
projectRef?: string
|
|
connectionString?: string | null
|
|
schema: string
|
|
}
|
|
|
|
export type SchemaCommentData = string | null
|
|
export type SchemaCommentError = Error
|
|
|
|
const getSchemaCommentSql = (schema: string) =>
|
|
safeSql`select obj_description(${literal(schema)}::regnamespace, 'pg_namespace') as comment;`
|
|
|
|
export async function getSchemaComment(
|
|
{ projectRef, connectionString, schema }: SchemaCommentVariables,
|
|
signal?: AbortSignal
|
|
): Promise<SchemaCommentData> {
|
|
const sql = getSchemaCommentSql(schema)
|
|
const { result } = await executeSql(
|
|
{
|
|
projectRef,
|
|
connectionString,
|
|
sql,
|
|
queryKey: ['pg-graphql', 'schema-comment', schema],
|
|
},
|
|
signal
|
|
)
|
|
const row = Array.isArray(result) ? result[0] : null
|
|
const comment = row?.comment
|
|
return typeof comment === 'string' ? comment : null
|
|
}
|
|
|
|
export const useSchemaCommentQuery = <TData = SchemaCommentData>(
|
|
{ projectRef, connectionString, schema }: SchemaCommentVariables,
|
|
{
|
|
enabled = true,
|
|
...options
|
|
}: UseCustomQueryOptions<SchemaCommentData, SchemaCommentError, TData> = {}
|
|
) => {
|
|
const { data: project } = useSelectedProjectQuery()
|
|
const isActive = project?.status === PROJECT_STATUS.ACTIVE_HEALTHY
|
|
|
|
return useQuery<SchemaCommentData, SchemaCommentError, TData>({
|
|
queryKey: pgGraphqlKeys.schemaComment(projectRef, schema),
|
|
queryFn: ({ signal }) => getSchemaComment({ projectRef, connectionString, schema }, signal),
|
|
enabled: enabled && projectRef !== undefined && isActive,
|
|
...options,
|
|
})
|
|
}
|