mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 09:55:06 +03:00
Clicking "Create and expose schema to Data API" fails with error: <img width="461" height="114" alt="image" src="https://github.com/user-attachments/assets/0b37c443-2cba-4f4b-8535-c1143801dc72" /> The postgrest config can return `db_pool` as null, but the mutation was passing it directly to the API which expects a number. This fix omits `db_pool` from the request body when null, allowing it to use its default value. - closes https://github.com/supabase/supabase/issues/41511 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved API settings configuration handling to properly manage database pool parameters, ensuring more accurate and reliable API schema mutations. <sub>✏️ Tip: You can customize this high-level summary in your review settings.</sub> <!-- end of auto-generated comment: release notes by coderabbit.ai -->
94 lines
2.6 KiB
TypeScript
94 lines
2.6 KiB
TypeScript
import { useMutation, useQueryClient } from '@tanstack/react-query'
|
|
import { toast } from 'sonner'
|
|
|
|
import { components } from 'api-types'
|
|
import { configKeys } from 'data/config/keys'
|
|
import { databaseKeys } from 'data/database/keys'
|
|
import { handleError, patch } from 'data/fetchers'
|
|
import { executeSql } from 'data/sql/execute-sql-query'
|
|
import type { ResponseError, UseCustomMutationOptions } from 'types'
|
|
|
|
export type CreateAndExposeAPISchemaVariables = {
|
|
projectRef: string
|
|
connectionString?: string | null
|
|
existingPostgrestConfig: {
|
|
db_pool?: number | null
|
|
max_rows: number
|
|
db_extra_search_path: string
|
|
db_schema: string
|
|
}
|
|
}
|
|
|
|
type UpdatePostgrestConfigBody = components['schemas']['UpdatePostgrestConfigBody']
|
|
|
|
export async function createAndExposeApiSchema({
|
|
projectRef,
|
|
connectionString,
|
|
existingPostgrestConfig,
|
|
}: CreateAndExposeAPISchemaVariables) {
|
|
const sql = `
|
|
create schema if not exists api;
|
|
grant usage on schema api to anon, authenticated;
|
|
`.trim()
|
|
|
|
await executeSql({ projectRef, connectionString, sql })
|
|
|
|
const { db_extra_search_path, db_pool, db_schema, max_rows } = existingPostgrestConfig
|
|
|
|
const body: UpdatePostgrestConfigBody = {
|
|
max_rows,
|
|
db_extra_search_path,
|
|
db_schema: `api, ${db_schema}`,
|
|
}
|
|
if (db_pool) body.db_pool = db_pool
|
|
|
|
const { error } = await patch('/platform/projects/{ref}/config/postgrest', {
|
|
params: { path: { ref: projectRef } },
|
|
body,
|
|
})
|
|
|
|
if (error) handleError(error)
|
|
return true
|
|
}
|
|
|
|
type CreateAndExposeAPISchemaData = Awaited<ReturnType<typeof createAndExposeApiSchema>>
|
|
|
|
export const useCreateAndExposeAPISchemaMutation = ({
|
|
onSuccess,
|
|
onError,
|
|
...options
|
|
}: Omit<
|
|
UseCustomMutationOptions<
|
|
CreateAndExposeAPISchemaData,
|
|
ResponseError,
|
|
CreateAndExposeAPISchemaVariables
|
|
>,
|
|
'mutationFn'
|
|
> = {}) => {
|
|
const queryClient = useQueryClient()
|
|
|
|
return useMutation<
|
|
CreateAndExposeAPISchemaData,
|
|
ResponseError,
|
|
CreateAndExposeAPISchemaVariables
|
|
>({
|
|
mutationFn: (vars) => createAndExposeApiSchema(vars),
|
|
async onSuccess(data, variables, context) {
|
|
const { projectRef } = variables
|
|
await Promise.all([
|
|
queryClient.invalidateQueries({ queryKey: databaseKeys.schemas(projectRef) }),
|
|
queryClient.invalidateQueries({ queryKey: configKeys.postgrest(projectRef) }),
|
|
])
|
|
await onSuccess?.(data, variables, context)
|
|
},
|
|
async onError(data, variables, context) {
|
|
if (onError === undefined) {
|
|
toast.error(`Failed to create and expose API schema: ${data.message}`)
|
|
} else {
|
|
onError(data, variables, context)
|
|
}
|
|
},
|
|
...options,
|
|
})
|
|
}
|