Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

Joshen/fe 2410 add default label to pg cron extension schema selector (#42281)

Joshen Lim1706a673358e
diff --git a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
index 1d4bcacf00d..af3a5bb586b 100644
--- a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
+++ b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
@@ -1,34 +1,53 @@
+import { zodResolver } from '@hookform/resolvers/zod'
import type { PostgresExtension } from '@supabase/postgres-meta'
import { DocsButton } from 'components/ui/DocsButton'
import { useDatabaseExtensionEnableMutation } from 'data/database-extensions/database-extension-enable-mutation'
import { useSchemasQuery } from 'data/database/schemas-query'
-import { executeSql } from 'data/sql/execute-sql-query'
import { useIsOrioleDb, useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { useProtectedSchemas } from 'hooks/useProtectedSchemas'
import { DOCS_URL } from 'lib/constants'
-import { Database, ExternalLinkIcon, Plus } from 'lucide-react'
-import { useEffect, useState } from 'react'
+import { useForm } from 'react-hook-form'
import { toast } from 'sonner'
import {
- AlertDescription_Shadcn_,
- AlertTitle_Shadcn_,
- Alert_Shadcn_,
+ Badge,
Button,
- Form,
- Input,
- Listbox,
- Modal,
- WarningIcon,
+ Dialog,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogSection,
+ DialogSectionSeparator,
+ DialogTitle,
+ FormControl_Shadcn_,
+ FormField_Shadcn_,
+ Form_Shadcn_,
+ Input_Shadcn_,
+ SelectContent_Shadcn_,
+ SelectItem_Shadcn_,
+ SelectSeparator_Shadcn_,
+ SelectTrigger_Shadcn_,
+ SelectValue_Shadcn_,
+ Select_Shadcn_,
} from 'ui'
import { Admonition } from 'ui-patterns'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import * as z from 'zod'
+
+import { extensionsWithRecommendedSchemas } from './Extensions.constants'
+import { useDatabaseExtensionDefaultSchemaQuery } from '@/data/database-extensions/database-extension-schema-query'
const orioleExtCallOuts = ['vector', 'postgis']
-// Extensions that have recommended schemas (rather than required schemas)
-const extensionsWithRecommendedSchemas: Record<string, string> = {
- wrappers: 'extensions',
-}
+const FormSchema = z.object({ name: z.string(), schema: z.string() }).superRefine((val, ctx) => {
+ if (val.schema === 'custom' && val.name.length === 0) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ path: ['name'],
+ message: 'Please provide a name for the schema',
+ })
+ }
+})
interface EnableExtensionModalProps {
visible: boolean
@@ -36,20 +55,44 @@ interface EnableExtensionModalProps {
onCancel: () => void
}
-const EnableExtensionModal = ({ visible, extension, onCancel }: EnableExtensionModalProps) => {
- const { data: project } = useSelectedProjectQuery()
+export const EnableExtensionModal = ({
+ visible,
+ extension,
+ onCancel,
+}: EnableExtensionModalProps) => {
const isOrioleDb = useIsOrioleDb()
- const [defaultSchema, setDefaultSchema] = useState()
- const [fetchingSchemaInfo, setFetchingSchemaInfo] = useState(false)
+ const { data: project } = useSelectedProjectQuery()
+ const { data: protectedSchemas } = useProtectedSchemas({ excludeSchemas: ['extensions'] })
+
+ const recommendedSchema = extensionsWithRecommendedSchemas[extension.name]
- const { data: schemas, isPending: isSchemasLoading } = useSchemasQuery(
+ const { data: schemas = [], isPending: isSchemasLoading } = useSchemasQuery(
{
projectRef: project?.ref,
connectionString: project?.connectionString,
},
{ enabled: visible }
)
- const { data: protectedSchemas } = useProtectedSchemas({ excludeSchemas: ['extensions'] })
+ const availableSchemas = schemas.filter(
+ (schema) =>
+ schema.name === recommendedSchema ||
+ !protectedSchemas.some((protectedSchema) => protectedSchema.name === schema.name)
+ )
+
+ const { data: extensionMeta, isPending: fetchingSchemaInfo } =
+ useDatabaseExtensionDefaultSchemaQuery(
+ {
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ extension: extension.name,
+ },
+ { enabled: visible }
+ )
+ // [Joshen] Hard-coding pg_cron here as this is enforced on our end (Not via pg_available_extension_versions)
+ const defaultSchema = extension.name === 'pg_cron' ? 'pg_catalog' : extensionMeta?.schema
+
+ const isLoading = fetchingSchemaInfo || isSchemasLoading
+
const { mutate: enableExtension, isPending: isEnabling } = useDatabaseExtensionEnableMutation({
onSuccess: () => {
toast.success(`Extension "${extension.name}" is now enabled`)
@@ -60,62 +103,16 @@ const EnableExtensionModal = ({ visible, extension, onCancel }: EnableExtensionM
},
})
- // [Joshen] Worth checking in with users - whether having this schema selection
- // might be confusing, and if we should have a tooltip to explain that schemas
- // are just concepts of namespace, you can use that extension no matter where it's
- // installed in
-
- useEffect(() => {
- let cancel = false
-
- if (visible) {
- const checkExtensionSchema = async () => {
- if (!cancel) {
- setFetchingSchemaInfo(true)
- setDefaultSchema(undefined)
- }
- try {
- const res = await executeSql({
- projectRef: project?.ref,
- connectionString: project?.connectionString,
- sql: `select * from pg_available_extension_versions where name = '${extension.name}'`,
- })
- if (!cancel) setDefaultSchema(res.result[0].schema)
- } catch (error) {}
-
- setFetchingSchemaInfo(false)
- }
- checkExtensionSchema()
- }
-
- return () => {
- cancel = true
- }
- }, [visible, extension.name])
-
- const getSchemaDescriptionText = (extensionName: string, schema: string | null | undefined) => {
- // Prioritize defaultSchema (required/forced) over recommended schema
- if (schema) {
- return `Extension must be installed in the “${schema}” schema.`
- }
-
- const recommendedSchema = extensionsWithRecommendedSchemas[extensionName]
- if (recommendedSchema) {
- return `Use the “${recommendedSchema}” schema for full compatibility with related features.`
- }
-
- return undefined
- }
-
- const isLoading = fetchingSchemaInfo || isSchemasLoading
-
- const validate = (values: any) => {
- const errors: any = {}
- if (values.schema === 'custom' && !values.name) errors.name = 'Required field'
- return errors
- }
+ const defaultValues = { name: extension.name, schema: recommendedSchema ?? 'extensions' }
+ const form = useForm<z.infer<typeof FormSchema>>({
+ mode: 'onBlur',
+ reValidateMode: 'onBlur',
+ resolver: zodResolver(FormSchema),
+ defaultValues,
+ })
+ const { schema } = form.watch()
- const onSubmit = async (values: any) => {
+ const onSubmit = async (values: z.infer<typeof FormSchema>) => {
if (project === undefined) return console.error('Project is required')
const schema =
@@ -137,149 +134,160 @@ const EnableExtensionModal = ({ visible, extension, onCancel }: EnableExtensionM
}
return (
- <Modal
- hideFooter
- visible={visible}
- onCancel={onCancel}
- size="small"
- header={
- <div className="flex items-baseline gap-2">
- <h5 className="text-foreground">Enable</h5>
- <code className="text-code-inline">{extension.name}</code>
- </div>
- }
+ <Dialog
+ open={visible}
+ onOpenChange={(open: boolean) => {
+ if (!open) onCancel()
+ }}
>
- <Form
- initialValues={{
- name: extension.name, // Name of new schema, if creating new
- schema: 'extensions',
- }}
- validate={validate}
- onSubmit={onSubmit}
- >
- {({ values }: any) => {
- return (
- <>
- <Modal.Content className="flex flex-col gap-y-2">
- {isOrioleDb && orioleExtCallOuts.includes(extension.name) && (
- <Admonition type="default" title="Extension is limited by OrioleDB">
- <span className="block">
- {extension.name} cannot be accelerated by indexes on tables that are using the
- OrioleDB access method
- </span>
- <DocsButton abbrev={false} className="mt-2" href={`${DOCS_URL}`} />
- </Admonition>
- )}
+ <DialogContent size="small" aria-describedby={undefined}>
+ <DialogHeader>
+ <DialogTitle>Enable {extension.name}</DialogTitle>
+ </DialogHeader>
+
+ <DialogSectionSeparator />
- {isLoading ? (
- <div className="space-y-2">
+ {isOrioleDb && orioleExtCallOuts.includes(extension.name) && (
+ <Admonition
+ type="default"
+ title="Extension is limited by OrioleDB"
+ className="border-x-0 border-t-0 rounded-none"
+ >
+ <span className="block">
+ {extension.name} cannot be accelerated by indexes on tables that are using the
+ OrioleDB access method
+ </span>
+ <DocsButton abbrev={false} className="mt-2" href={`${DOCS_URL}`} />
+ </Admonition>
+ )}
+
+ {extension.name === 'pg_cron' && project?.cloud_provider === 'FLY' && (
+ <Admonition
+ type="warning"
+ title="The pg_cron extension is not fully supported for Fly projects"
+ className="border-x-0 border-t-0 rounded-none"
+ >
+ <p>
+ You can still enable the extension, but pg_cron jobs may not run due to the behavior
+ of Fly projects.
+ </p>
+ <DocsButton
+ className="mt-2"
+ href={`${DOCS_URL}/guides/platform/fly-postgres#limitations`}
+ />
+ </Admonition>
+ )}
+
+ <DialogSection>
+ <Form_Shadcn_ {...form}>
+ <form id="enable-extensions-form" onSubmit={form.handleSubmit(onSubmit)}>
+ {isLoading ? (
+ <div className="space-y-2">
+ <ShimmeringLoader />
+ <div className="w-3/4">
<ShimmeringLoader />
- <div className="w-3/4">
- <ShimmeringLoader />
- </div>
</div>
- ) : defaultSchema ? (
- <Input
- disabled
- id="schema"
- name="schema"
- value={defaultSchema}
+ </div>
+ ) : !!defaultSchema ? (
+ <div className="flex flex-col gap-y-2">
+ <FormItemLayout
+ isReactForm={false}
label="Select a schema to enable the extension for"
- descriptionText={getSchemaDescriptionText(extension.name, defaultSchema)}
- />
- ) : (
- <Listbox
- size="small"
- name="schema"
- label="Select a schema to enable the extension for"
- descriptionText={getSchemaDescriptionText(extension.name, null)}
>
- <Listbox.Option
- key="custom"
- id="custom"
- label={`Create a new schema "${extension.name}"`}
- value="custom"
- addOnBefore={() => <Plus size={16} strokeWidth={1.5} />}
- >
- Create a new schema "{extension.name}"
- </Listbox.Option>
- <Modal.Separator />
- {schemas
- ?.filter(
- (schema) =>
- !protectedSchemas.some(
- (protectedSchema) => protectedSchema.name === schema.name
- )
- )
- .map((schema) => {
- return (
- <Listbox.Option
- key={schema.id}
- id={schema.name}
- label={schema.name}
- value={schema.name}
- addOnBefore={() => <Database size={16} strokeWidth={1.5} />}
+ <Input_Shadcn_ disabled value={defaultSchema} />
+ </FormItemLayout>
+ <p className="text-sm text-foreground-light">
+ Extension must be installed in the “{defaultSchema}” schema.
+ </p>
+ </div>
+ ) : (
+ <div className="flex flex-col gap-y-2">
+ <FormField_Shadcn_
+ key="schema"
+ name="schema"
+ control={form.control}
+ render={({ field }) => (
+ <FormItemLayout
+ name="schema"
+ label="Select a schema to enable the extension for"
+ >
+ <FormControl_Shadcn_>
+ <Select_Shadcn_
+ value={field.value}
+ onValueChange={field.onChange}
+ disabled={!!defaultSchema}
>
- {schema.name}
- </Listbox.Option>
- )
- })}
- </Listbox>
- )}
- </Modal.Content>
-
- {values.schema === 'custom' && (
- <Modal.Content>
- <Input id="name" name="name" label="Schema name" />
- </Modal.Content>
- )}
-
- {extension.name === 'pg_cron' && project?.cloud_provider === 'FLY' && (
- <Modal.Content>
- <Alert_Shadcn_ variant="warning">
- <WarningIcon />
- <AlertTitle_Shadcn_>
- The pg_cron extension is not fully supported for Fly projects
- </AlertTitle_Shadcn_>
+ <SelectTrigger_Shadcn_>
+ <SelectValue_Shadcn_ placeholder="Select a schema" />
+ </SelectTrigger_Shadcn_>
+ <SelectContent_Shadcn_>
+ <SelectItem_Shadcn_ value="custom">
+ Create a new schema{' '}
+ <code className="text-code-inline">{extension.name}</code>
+ </SelectItem_Shadcn_>
+ <SelectSeparator_Shadcn_ />
+ {availableSchemas.map((schema) => {
+ return (
+ <SelectItem_Shadcn_ key={schema.id} value={schema.name}>
+ {schema.name}
+ {schema.name === recommendedSchema ? (
+ <Badge className="ml-2" variant="success">
+ Recommended
+ </Badge>
+ ) : !defaultSchema && schema.name === 'extensions' ? (
+ <Badge className="ml-2">Default</Badge>
+ ) : null}
+ </SelectItem_Shadcn_>
+ )
+ })}
+ </SelectContent_Shadcn_>
+ </Select_Shadcn_>
+ </FormControl_Shadcn_>
+ </FormItemLayout>
+ )}
+ />
- <AlertDescription_Shadcn_>
- You can still enable the extension, but pg_cron jobs may not run due to the
- behavior of Fly projects.
- </AlertDescription_Shadcn_>
+ {!!recommendedSchema && (
+ <p className="text-sm text-foreground-light">
+ Use the "{recommendedSchema}" schema for full compatibility with related
+ features.
+ </p>
+ )}
- <AlertDescription_Shadcn_ className="mt-3">
- <Button
- asChild
- type="default"
- iconRight={<ExternalLinkIcon width={12} height={12} />}
- >
- <a
- href="/docs/guides/platform/fly-postgres#limitations"
- target="_blank"
- rel="noopener noreferrer"
- >
- <span>Learn more</span>
- </a>
- </Button>
- </AlertDescription_Shadcn_>
- </Alert_Shadcn_>
- </Modal.Content>
+ {schema === 'custom' && (
+ <FormField_Shadcn_
+ key="name"
+ name="name"
+ control={form.control}
+ render={({ field }) => (
+ <FormItemLayout name="name" label="Schema name">
+ <FormControl_Shadcn_>
+ <Input_Shadcn_ {...field} />
+ </FormControl_Shadcn_>
+ </FormItemLayout>
+ )}
+ />
+ )}
+ </div>
)}
- <Modal.Separator />
- <Modal.Content className="flex items-center justify-end space-x-2">
- <Button type="default" disabled={isEnabling} onClick={() => onCancel()}>
- Cancel
- </Button>
- <Button htmlType="submit" disabled={isEnabling || isLoading} loading={isEnabling}>
- Enable extension
- </Button>
- </Modal.Content>
- </>
- )
- }}
- </Form>
- </Modal>
+ </form>
+ </Form_Shadcn_>
+ </DialogSection>
+
+ <DialogFooter>
+ <Button type="default" disabled={isEnabling} onClick={() => onCancel()}>
+ Cancel
+ </Button>
+ <Button
+ htmlType="submit"
+ form="enable-extensions-form"
+ loading={isEnabling}
+ disabled={isLoading || isEnabling}
+ >
+ Enable extension
+ </Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
)
}
-
-export default EnableExtensionModal
diff --git a/apps/studio/components/interfaces/Database/Extensions/ExtensionRow.tsx b/apps/studio/components/interfaces/Database/Extensions/ExtensionRow.tsx
index 883c350167e..56a7e863902 100644
--- a/apps/studio/components/interfaces/Database/Extensions/ExtensionRow.tsx
+++ b/apps/studio/components/interfaces/Database/Extensions/ExtensionRow.tsx
@@ -1,20 +1,20 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { AlertTriangle, Book, Github, Loader2 } from 'lucide-react'
-import Link from 'next/link'
-import { useState } from 'react'
-import { toast } from 'sonner'
-
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
import { useDatabaseExtensionDisableMutation } from 'data/database-extensions/database-extension-disable-mutation'
import { DatabaseExtension } from 'data/database-extensions/database-extensions-query'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useIsOrioleDb, useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { DOCS_URL } from 'lib/constants'
+import { AlertTriangle, Book, Github, Loader2 } from 'lucide-react'
+import Link from 'next/link'
+import { useState } from 'react'
import { extensions } from 'shared-data'
+import { toast } from 'sonner'
import { Button, Switch, TableCell, TableRow, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
import { Admonition } from 'ui-patterns'
-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
-import EnableExtensionModal from './EnableExtensionModal'
+import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
+
+import { EnableExtensionModal } from './EnableExtensionModal'
import { EXTENSION_DISABLE_WARNINGS } from './Extensions.constants'
interface ExtensionRowProps {
diff --git a/apps/studio/components/interfaces/Database/Extensions/Extensions.constants.ts b/apps/studio/components/interfaces/Database/Extensions/Extensions.constants.ts
index d22f90d7b86..065adf1b7dc 100644
--- a/apps/studio/components/interfaces/Database/Extensions/Extensions.constants.ts
+++ b/apps/studio/components/interfaces/Database/Extensions/Extensions.constants.ts
@@ -24,3 +24,8 @@ export const SEARCH_TERMS: Record<string, string[]> = {
export const EXTENSION_DISABLE_WARNINGS: Record<string, string> = {
pg_cron: 'Disabling this extension will delete all scheduled jobs. This cannot be undone.',
}
+
+// Extensions that have recommended schemas (rather than required schemas)
+export const extensionsWithRecommendedSchemas: Record<string, string> = {
+ wrappers: 'extensions',
+}
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
index 53e4232800d..a836fbc2d25 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
@@ -1,13 +1,8 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { parseAsString, useQueryState } from 'nuqs'
-import { useEffect, useState } from 'react'
-import { SubmitHandler, useForm } from 'react-hook-form'
-import { toast } from 'sonner'
-
import { useWatch } from '@ui/components/shadcn/ui/form'
import { useParams } from 'common'
-import EnableExtensionModal from 'components/interfaces/Database/Extensions/EnableExtensionModal'
+import { EnableExtensionModal } from 'components/interfaces/Database/Extensions/EnableExtensionModal'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
import { getDatabaseCronJob } from 'data/database-cron-jobs/database-cron-job-query'
import { useDatabaseCronJobCreateMutation } from 'data/database-cron-jobs/database-cron-jobs-create-mutation'
@@ -17,11 +12,15 @@ import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
+import { parseAsString, useQueryState } from 'nuqs'
+import { useEffect, useState } from 'react'
+import { SubmitHandler, useForm } from 'react-hook-form'
+import { toast } from 'sonner'
import {
Button,
- Form_Shadcn_,
FormControl_Shadcn_,
FormField_Shadcn_,
+ Form_Shadcn_,
Input_Shadcn_,
RadioGroupStacked,
RadioGroupStackedItem,
@@ -34,6 +33,7 @@ import {
} from 'ui'
import { Admonition } from 'ui-patterns/admonition'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+
import { CRONJOB_DEFINITIONS } from '../CronJobs.constants'
import { buildCronQuery, buildHttpRequestCommand, parseCronJobCommand } from '../CronJobs.utils'
import { EdgeFunctionSection } from '../EdgeFunctionSection'
@@ -43,9 +43,9 @@ import { HttpRequestSection } from '../HttpRequestSection'
import { SqlFunctionSection } from '../SqlFunctionSection'
import { SqlSnippetSection } from '../SqlSnippetSection'
import {
- FormSchema,
type CreateCronJobForm,
type CronJobType,
+ FormSchema,
} from './CreateCronJobSheet.constants'
import { CronJobScheduleSection } from './CronJobScheduleSection'
diff --git a/apps/studio/components/interfaces/Integrations/Integration/MissingExtensionAlert.tsx b/apps/studio/components/interfaces/Integrations/Integration/MissingExtensionAlert.tsx
index 54526a943fd..d8dbc1312a1 100644
--- a/apps/studio/components/interfaces/Integrations/Integration/MissingExtensionAlert.tsx
+++ b/apps/studio/components/interfaces/Integrations/Integration/MissingExtensionAlert.tsx
@@ -1,7 +1,6 @@
-import { useState } from 'react'
-
-import EnableExtensionModal from 'components/interfaces/Database/Extensions/EnableExtensionModal'
+import { EnableExtensionModal } from 'components/interfaces/Database/Extensions/EnableExtensionModal'
import { DatabaseExtension } from 'data/database-extensions/database-extensions-query'
+import { useState } from 'react'
import { Button } from 'ui'
export const MissingExtensionAlert = ({ extension }: { extension: DatabaseExtension }) => {
diff --git a/apps/studio/data/database-extensions/database-extension-schema-query.ts b/apps/studio/data/database-extensions/database-extension-schema-query.ts
new file mode 100644
index 00000000000..ef7b2d6ca02
--- /dev/null
+++ b/apps/studio/data/database-extensions/database-extension-schema-query.ts
@@ -0,0 +1,59 @@
+import { useQuery } from '@tanstack/react-query'
+import { UseCustomQueryOptions } from 'types'
+
+import { ExecuteSqlError, executeSql } from '../sql/execute-sql-query'
+import { getDatabaseExtensionDefaultSchemaSQL } from '../sql/queries/get-extension-default-schema'
+import { databaseExtensionsKeys } from './keys'
+
+type DatabaseExtensionDefaultSchemaVariables = {
+ extension?: string
+ projectRef?: string
+ connectionString?: string | null
+}
+
+async function getDatabaseExtensionDefaultSchema(
+ { extension, projectRef, connectionString }: DatabaseExtensionDefaultSchemaVariables,
+ signal?: AbortSignal
+) {
+ if (!extension) {
+ throw new Error('extension is required')
+ }
+
+ const sql = getDatabaseExtensionDefaultSchemaSQL({ extension })
+
+ const { result } = await executeSql(
+ {
+ projectRef,
+ connectionString,
+ sql,
+ queryKey: ['database-extension-default-schema', extension],
+ },
+ signal
+ )
+
+ return result[0] as { name: string; version: string; schema: string | null }
+}
+
+type DatabaseExtensionDefaultSchemaData = Awaited<
+ ReturnType<typeof getDatabaseExtensionDefaultSchema>
+>
+type DatabaseExtensionDefaultSchemaError = ExecuteSqlError
+
+export const useDatabaseExtensionDefaultSchemaQuery = <TData = DatabaseExtensionDefaultSchemaData>(
+ { projectRef, connectionString, extension }: DatabaseExtensionDefaultSchemaVariables,
+ {
+ enabled = true,
+ ...options
+ }: UseCustomQueryOptions<
+ DatabaseExtensionDefaultSchemaData,
+ DatabaseExtensionDefaultSchemaError,
+ TData
+ > = {}
+) =>
+ useQuery<DatabaseExtensionDefaultSchemaData, DatabaseExtensionDefaultSchemaError, TData>({
+ queryKey: databaseExtensionsKeys.defaultSchema(projectRef, extension),
+ queryFn: ({ signal }) =>
+ getDatabaseExtensionDefaultSchema({ projectRef, connectionString, extension }, signal),
+ enabled: enabled && typeof projectRef !== 'undefined' && typeof extension !== 'undefined',
+ ...options,
+ })
diff --git a/apps/studio/data/database-extensions/keys.ts b/apps/studio/data/database-extensions/keys.ts
index 930b7eaefc7..b139610ffd4 100644
--- a/apps/studio/data/database-extensions/keys.ts
+++ b/apps/studio/data/database-extensions/keys.ts
@@ -1,4 +1,6 @@
export const databaseExtensionsKeys = {
list: (projectRef: string | undefined) =>
['projects', projectRef, 'database-extensions'] as const,
+ defaultSchema: (projectRef: string | undefined, extension: string | undefined) =>
+ ['projects', projectRef, 'database-extensions', extension, 'default-schema'] as const,
}
diff --git a/apps/studio/data/sql/queries/get-extension-default-schema.ts b/apps/studio/data/sql/queries/get-extension-default-schema.ts
new file mode 100644
index 00000000000..82e670ff8bd
--- /dev/null
+++ b/apps/studio/data/sql/queries/get-extension-default-schema.ts
@@ -0,0 +1,9 @@
+import { literal } from '@supabase/pg-meta/src/pg-format'
+
+export const getDatabaseExtensionDefaultSchemaSQL = ({ extension }: { extension: string }) => {
+ const sql = /* SQL */ `
+select name, version, schema from pg_available_extension_versions where name = ${literal(extension)} limit 1;
+`.trim()
+
+ return sql
+}