Skip to content

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

Joshen/fe 2921 extension integrations need to check for default schemas (#44385)

Joshen Lim55bdf3cebf1c
diff --git a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
index 344dc5dd760..f7c4c269c5a 100644
--- a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
+++ b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
@@ -1,5 +1,5 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import type { PostgresExtension } from '@supabase/postgres-meta'
+import { type DatabaseExtension } from 'data/database-extensions/database-extensions-query'
import { useForm } from 'react-hook-form'
import { toast } from 'sonner'
import {
@@ -31,7 +31,6 @@ import * as z from 'zod'
import { extensionsWithRecommendedSchemas } from './Extensions.constants'
import { DocsButton } from '@/components/ui/DocsButton'
import { useDatabaseExtensionEnableMutation } from '@/data/database-extensions/database-extension-enable-mutation'
-import { useDatabaseExtensionDefaultSchemaQuery } from '@/data/database-extensions/database-extension-schema-query'
import { useSchemasQuery } from '@/data/database/schemas-query'
import { useIsOrioleDb, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useProtectedSchemas } from '@/hooks/useProtectedSchemas'
@@ -51,7 +50,7 @@ const FormSchema = z.object({ name: z.string(), schema: z.string() }).superRefin
interface EnableExtensionModalProps {
visible: boolean
- extension: PostgresExtension
+ extension: DatabaseExtension
onCancel: () => void
}
@@ -66,7 +65,7 @@ export const EnableExtensionModal = ({
const recommendedSchema = extensionsWithRecommendedSchemas[extension.name]
- const { data: schemas = [], isPending: isSchemasLoading } = useSchemasQuery(
+ const { data: schemas = [], isPending: isLoading } = useSchemasQuery(
{
projectRef: project?.ref,
connectionString: project?.connectionString,
@@ -79,19 +78,9 @@ export const EnableExtensionModal = ({
!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 defaultSchema =
+ extension.name === 'pg_cron' ? 'pg_catalog' : extension.default_version_schema
const { mutate: enableExtension, isPending: isEnabling } = useDatabaseExtensionEnableMutation({
onSuccess: () => {
@@ -197,7 +186,7 @@ export const EnableExtensionModal = ({
<Input_Shadcn_ disabled value={defaultSchema} />
</FormItemLayout>
<p className="text-sm text-foreground-light">
- Extension must be installed in the “{defaultSchema}” schema.
+ Extension must be installed in the "{defaultSchema}" schema.
</p>
</div>
) : (
diff --git a/apps/studio/components/interfaces/Database/Extensions/Extensions.tsx b/apps/studio/components/interfaces/Database/Extensions/Extensions.tsx
index df988fa0d57..dcaed37668b 100644
--- a/apps/studio/components/interfaces/Database/Extensions/Extensions.tsx
+++ b/apps/studio/components/interfaces/Database/Extensions/Extensions.tsx
@@ -29,24 +29,24 @@ export const Extensions = () => {
const { data: project } = useSelectedProjectQuery()
const [filterString, setFilterString] = useState<string>('')
- const { data, isPending: isLoading } = useDatabaseExtensionsQuery({
+ const { data = [], isPending: isLoading } = useDatabaseExtensionsQuery({
projectRef: project?.ref,
connectionString: project?.connectionString,
})
+ const visibleExtensions = data.filter((ext) => !HIDDEN_EXTENSIONS.includes(ext.name))
const extensions =
filterString.length === 0
- ? (data ?? [])
- : (data ?? []).filter((ext) => {
+ ? visibleExtensions
+ : visibleExtensions.filter((ext) => {
const nameMatchesSearch = ext.name.toLowerCase().includes(filterString.toLowerCase())
const searchTermsMatchesSearch = (SEARCH_TERMS[ext.name] || []).some((x) =>
x.includes(filterString.toLowerCase())
)
return nameMatchesSearch || searchTermsMatchesSearch
})
- const extensionsWithoutHidden = extensions.filter((ext) => !HIDDEN_EXTENSIONS.includes(ext.name))
const [enabledExtensions, disabledExtensions] = partition(
- extensionsWithoutHidden,
+ extensions,
(ext) => !isNull(ext.installed_version)
)
diff --git a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet.tsx b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet.tsx
index 36a0897c209..c3680db6fc8 100644
--- a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet.tsx
+++ b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
import { toast } from 'sonner'
import {
Accordion_Shadcn_,
@@ -36,7 +36,7 @@ import { Input } from 'ui-patterns/DataInputs/Input'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { IntegrationDefinition } from '../../Landing/Integrations.constants'
-import { getEnableExtensionsSQL } from './IntegrationOverviewTabV2.utils'
+import { getEnableExtensionsSQL, getExtensionDefaultSchema } from './IntegrationOverviewTabV2.utils'
import { extensionsWithRecommendedSchemas } from '@/components/interfaces/Database/Extensions/Extensions.constants'
import { useDatabaseExtensionEnableMutation } from '@/data/database-extensions/database-extension-enable-mutation'
import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'
@@ -76,30 +76,35 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
} = integration
const allowExtensionCustomSchema = !installationSql
-
- const defaultExtensionsSchema = Object.fromEntries(
- requiredExtensionNames.map((extName) => [extName, { schema: 'extensions', value: undefined }])
- )
- const [extensionsSchema, setExtensionsSchema] = useState<{
- [key: string]: { schema: string; value: string | undefined }
- }>(defaultExtensionsSchema)
-
const involvesExtensions = requiredExtensionNames.length > 0
// [Joshen] Will hook these up in the future, applicable for stripe sync engine
const involvesEdgeFunctions = false
- const { data: extensions = [] } = useDatabaseExtensionsQuery(
+ const { data: extensions = [], isSuccess: isSuccessExtensions } = useDatabaseExtensionsQuery(
{ projectRef: project?.ref, connectionString: project?.connectionString },
{ enabled: involvesExtensions }
)
- const requiredExtensions = extensions.filter((ext) => requiredExtensionNames.includes(ext.name))
- // [Joshen] Integration requires extensions that are not available to install on the current database image
- const hasMissingExtensions = requiredExtensionNames.length !== requiredExtensions.length
const { data: schemas = [] } = useSchemasQuery(
{ projectRef: project?.ref, connectionString: project?.connectionString },
{ enabled: involvesExtensions }
)
+
+ const defaultExtensionsSchema = Object.fromEntries(
+ requiredExtensionNames.map((extName) => {
+ const ext = extensions.find((x) => x.name === extName)
+ const defaultSchema = getExtensionDefaultSchema(ext)
+ return [extName, { schema: defaultSchema ?? 'extensions', value: undefined }]
+ })
+ )
+ const [extensionsSchema, setExtensionsSchema] = useState<{
+ [key: string]: { schema: string; value: string | undefined }
+ }>(defaultExtensionsSchema)
+
+ const requiredExtensions = extensions.filter((ext) => requiredExtensionNames.includes(ext.name))
+ // [Joshen] Integration requires extensions that are not available to install on the current database image
+ const hasMissingExtensions = requiredExtensionNames.length !== requiredExtensions.length
+
const availableSchemas = schemas.filter(
(schema) => !protectedSchemas.some((protectedSchema) => protectedSchema.name === schema.name)
)
@@ -120,9 +125,9 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
const toastId = toast.loading(`Installing ${name}`)
try {
- if (!!installationCommand) {
+ if (installationCommand) {
await installationCommand({ ref: project.ref })
- } else if (!!installationSql) {
+ } else if (installationSql) {
await installIntegrationViaSQL()
} else {
await installIntegrationExtensions()
@@ -144,11 +149,7 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
if (!installationSql) return console.error('Installation SQL is required')
const { ref: projectRef, connectionString } = project
- try {
- await executeSql({ projectRef, connectionString, sql: installationSql })
- } catch (error) {
- throw error
- }
+ await executeSql({ projectRef, connectionString, sql: installationSql })
}
const installIntegrationExtensions = async () => {
@@ -161,12 +162,13 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
.map((ext) => {
const { name, default_version: version } = ext
const createSchema = extensionsSchema[name].schema === 'custom'
+
+ const defaultSchema = getExtensionDefaultSchema(ext)
const schema =
- name === 'pg_cron'
- ? 'pg_catalog'
- : createSchema
- ? (extensionsSchema[name].value as string)
- : extensionsSchema[name].schema
+ defaultSchema ||
+ (createSchema
+ ? (extensionsSchema[name].value as string)
+ : extensionsSchema[name].schema)
return enableExtension({
projectRef,
@@ -181,9 +183,14 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
)
const failure = results.find((r) => r.status === 'rejected')
- if (!!failure) throw new Error(failure.reason.message)
+ if (failure) throw new Error(failure.reason.message)
}
+ useEffect(() => {
+ if (isSuccessExtensions) return
+ setExtensionsSchema(defaultExtensionsSchema)
+ }, [isSuccessExtensions, defaultExtensionsSchema])
+
return (
<Sheet open={open} onOpenChange={setOpen}>
<SheetTrigger asChild>
@@ -293,9 +300,10 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
</p>
{requiredExtensionNames.map((extName) => {
const ext = extensions.find((x) => x.name === extName)
- const extMeta = extensionsSchema[extName as keyof typeof extensionsSchema]
+ const extMeta = extensionsSchema[extName]
const { schema, value } = extMeta
const recommendedSchema = extensionsWithRecommendedSchemas[extName]
+ const defaultSchema = getExtensionDefaultSchema(ext)
return (
<FormItemLayout
@@ -304,22 +312,27 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
layout="horizontal"
label={extName}
description={
- !!recommendedSchema ? (
+ ext?.installed_version ? (
+ <>
+ Installed in{' '}
+ <code className="text-code-inline">{ext.schema}</code> schema
+ </>
+ ) : defaultSchema ? (
+ <>
+ Must be installed in the{' '}
+ <code className="text-code-inline">{defaultSchema}</code> schema
+ </>
+ ) : recommendedSchema ? (
<>
Use the{' '}
<code className="text-code-inline">{recommendedSchema}</code>{' '}
schema for full compatibility with related features
</>
- ) : !!ext?.installed_version ? (
- <>
- Installed in{' '}
- <code className="text-code-inline">{ext.schema}</code> schema
- </>
) : undefined
}
>
<Select_Shadcn_
- disabled={!!ext?.installed_version}
+ disabled={!!defaultSchema || !!ext?.installed_version}
value={schema}
onValueChange={(schema) =>
setExtensionsSchema((prev) => ({
@@ -353,6 +366,15 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
</SelectItem_Shadcn_>
)
})}
+ {defaultSchema &&
+ !availableSchemas.some(
+ (schema) => schema.name === defaultSchema
+ ) ? (
+ <SelectItem_Shadcn_ key={defaultSchema} value={defaultSchema}>
+ {defaultSchema}
+ <Badge className="ml-2">Default</Badge>
+ </SelectItem_Shadcn_>
+ ) : null}
</SelectContent_Shadcn_>
</Select_Shadcn_>
@@ -398,7 +420,7 @@ export const InstallIntegrationSheet = ({ integration }: InstallIntegrationSheet
</SheetClose>
<Button
type="primary"
- disabled={hasMissingExtensions && !installationCommand}
+ disabled={hasMissingExtensions}
loading={isInstalling}
onClick={onInstallIntegration}
>
diff --git a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/IntegrationOverviewTabV2.utils.ts b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/IntegrationOverviewTabV2.utils.ts
index 764dc085733..edfd5a275fa 100644
--- a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/IntegrationOverviewTabV2.utils.ts
+++ b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/IntegrationOverviewTabV2.utils.ts
@@ -40,3 +40,8 @@ export const getEnableExtensionsSQL = ({
.join('\n\n')
.trim()
}
+
+export const getExtensionDefaultSchema = (ext?: DatabaseExtension) => {
+ if (!ext) return null
+ return ext.name === 'pg_cron' ? 'pg_catalog' : ext.default_version_schema
+}
diff --git a/apps/studio/data/database-extensions/database-extension-schema-query.ts b/apps/studio/data/database-extensions/database-extension-schema-query.ts
deleted file mode 100644
index f6a487fc029..00000000000
--- a/apps/studio/data/database-extensions/database-extension-schema-query.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { getDatabaseExtensionDefaultSchemaSQL } from '@supabase/pg-meta'
-import { useQuery } from '@tanstack/react-query'
-import { UseCustomQueryOptions } from 'types'
-
-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'
-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/database-extensions-query.ts b/apps/studio/data/database-extensions/database-extensions-query.ts
index 0c6f7388d8c..75da1347c6b 100644
--- a/apps/studio/data/database-extensions/database-extensions-query.ts
+++ b/apps/studio/data/database-extensions/database-extensions-query.ts
@@ -1,13 +1,16 @@
-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'
import { useQuery } from '@tanstack/react-query'
import { components } from 'api-types'
-import { get, handleError } from 'data/fetchers'
+import { executeSql } from 'data/sql/execute-sql-query'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from 'lib/constants'
+import { getDatabaseExtensionsSQL } from 'node_modules/@supabase/pg-meta/src'
import type { ResponseError, UseCustomQueryOptions } from 'types'
+
import { databaseExtensionsKeys } from './keys'
-export type DatabaseExtension = components['schemas']['PostgresExtension']
+export type DatabaseExtension = components['schemas']['PostgresExtension'] & {
+ default_version_schema: string | null
+}
export type DatabaseExtensionsVariables = {
projectRef?: string
@@ -16,30 +19,14 @@ export type DatabaseExtensionsVariables = {
export async function getDatabaseExtensions(
{ projectRef, connectionString }: DatabaseExtensionsVariables,
- signal?: AbortSignal,
- headersInit?: HeadersInit
+ signal?: AbortSignal
) {
- if (!projectRef) throw new Error('projectRef is required')
-
- let headers = new Headers(headersInit)
- if (connectionString) headers.set('x-connection-encrypted', connectionString)
-
- const { data, error } = await get('/platform/pg-meta/{ref}/extensions', {
- params: {
- header: {
- 'x-connection-encrypted': connectionString!,
- 'x-pg-application-name': DEFAULT_PLATFORM_APPLICATION_NAME,
- },
- path: {
- ref: projectRef,
- },
- },
- headers,
- signal,
- })
-
- if (error) handleError(error)
- return data
+ const sql = getDatabaseExtensionsSQL()
+ const { result } = await executeSql(
+ { projectRef, connectionString, sql, queryKey: ['database-extensions'] },
+ signal
+ )
+ return result as DatabaseExtension[]
}
export type DatabaseExtensionsData = Awaited<ReturnType<typeof getDatabaseExtensions>>
diff --git a/apps/studio/data/database-extensions/keys.ts b/apps/studio/data/database-extensions/keys.ts
index b139610ffd4..930b7eaefc7 100644
--- a/apps/studio/data/database-extensions/keys.ts
+++ b/apps/studio/data/database-extensions/keys.ts
@@ -1,6 +1,4 @@
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/e2e/studio/features/database.spec.ts b/e2e/studio/features/database.spec.ts
index 359b184a613..a801dafead0 100644
--- a/e2e/studio/features/database.spec.ts
+++ b/e2e/studio/features/database.spec.ts
@@ -758,6 +758,267 @@ test.describe('Database', () => {
})
})
+test.describe('Database Extensions', () => {
+ test.describe.configure({ mode: 'serial' })
+
+ const EXTENSION_NAME = 'pgtap'
+
+ test('can enable an extension', async ({ page, ref }) => {
+ await query(`DROP EXTENSION IF EXISTS ${EXTENSION_NAME} CASCADE;`)
+
+ const extensionsWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await page.goto(toUrl(`/project/${env.PROJECT_REF}/database/extensions`))
+ await extensionsWait
+
+ await page.getByPlaceholder('Search for an extension').fill(EXTENSION_NAME)
+
+ const row = page.getByRole('row').filter({ hasText: EXTENSION_NAME }).first()
+ await expect(row, 'Extension row should be visible').toBeVisible()
+
+ await row.getByRole('switch').click()
+
+ const dialog = page.getByRole('dialog')
+ await expect(dialog, 'Enable extension dialog should be visible').toBeVisible()
+ await expect(
+ dialog.getByText(`Enable ${EXTENSION_NAME}`),
+ 'Dialog title should match extension name'
+ ).toBeVisible()
+
+ const enableWait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=extension-create')
+ const refetchWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await dialog.getByRole('button', { name: 'Enable extension' }).click()
+ await enableWait
+ await refetchWait
+
+ await expect(
+ page.getByText(`Extension "${EXTENSION_NAME}" is now enabled`),
+ 'Success toast should appear after enabling extension'
+ ).toBeVisible({ timeout: 15000 })
+
+ await expect(
+ row.getByRole('switch'),
+ 'Extension switch should be checked after enabling'
+ ).toBeChecked()
+ })
+
+ test('can disable an extension', async ({ page, ref }) => {
+ const extensionsWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await page.goto(toUrl(`/project/${env.PROJECT_REF}/database/extensions`))
+ await extensionsWait
+
+ await page.getByPlaceholder('Search for an extension').fill(EXTENSION_NAME)
+
+ const row = page.getByRole('row').filter({ hasText: EXTENSION_NAME }).first()
+ await expect(row, 'Extension row should be visible').toBeVisible()
+
+ await row.getByRole('switch').click()
+
+ const dialog = page.getByRole('dialog')
+ await expect(dialog, 'Disable confirmation dialog should be visible').toBeVisible()
+ await expect(
+ dialog.getByText('Confirm to disable extension'),
+ 'Dialog title should be correct'
+ ).toBeVisible()
+
+ const disableWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ `query?key=extension-delete-${EXTENSION_NAME}`
+ )
+ const refetchWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await page.getByRole('button', { name: 'Disable' }).click()
+ await disableWait
+ await refetchWait
+
+ await expect(
+ page.getByText(`${EXTENSION_NAME} is off.`),
+ 'Success toast should appear after disabling extension'
+ ).toBeVisible({ timeout: 15000 })
+
+ await expect(
+ row.getByRole('switch'),
+ 'Extension switch should be unchecked after disabling'
+ ).not.toBeChecked()
+ })
+
+ test('can enable an extension in a different existing schema', async ({ page, ref }) => {
+ await query(`DROP EXTENSION IF EXISTS ${EXTENSION_NAME} CASCADE;`)
+
+ const extensionsWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await page.goto(toUrl(`/project/${env.PROJECT_REF}/database/extensions`))
+ await extensionsWait
+
+ await page.getByPlaceholder('Search for an extension').fill(EXTENSION_NAME)
+
+ const row = page.getByRole('row').filter({ hasText: EXTENSION_NAME }).first()
+ await expect(row, 'Extension row should be visible').toBeVisible()
+ await row.getByRole('switch').click()
+
+ const dialog = page.getByRole('dialog')
+ await expect(dialog, 'Enable extension dialog should be visible').toBeVisible()
+
+ // Change schema to 'public'
+ await dialog.getByRole('combobox').click()
+ await page.getByRole('option', { name: 'public', exact: true }).click()
+
+ const enableWait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=extension-create')
+ const refetchWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await dialog.getByRole('button', { name: 'Enable extension' }).click()
+ await enableWait
+ await refetchWait
+
+ await expect(
+ page.getByText(`Extension "${EXTENSION_NAME}" is now enabled`),
+ 'Success toast should appear after enabling in public schema'
+ ).toBeVisible({ timeout: 15000 })
+
+ await expect(
+ row.getByRole('switch'),
+ 'Extension switch should be checked after enabling in public schema'
+ ).toBeChecked()
+
+ // Cleanup
+ await query(`DROP EXTENSION IF EXISTS ${EXTENSION_NAME} CASCADE;`)
+ })
+
+ test('can enable an extension in a new schema', async ({ page, ref }) => {
+ await query(`DROP EXTENSION IF EXISTS ${EXTENSION_NAME} CASCADE;`)
+
+ const extensionsWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await page.goto(toUrl(`/project/${env.PROJECT_REF}/database/extensions`))
+ await extensionsWait
+
+ await page.getByPlaceholder('Search for an extension').fill(EXTENSION_NAME)
+
+ const row = page.getByRole('row').filter({ hasText: EXTENSION_NAME }).first()
+ await expect(row, 'Extension row should be visible').toBeVisible()
+ await row.getByRole('switch').click()
+
+ const dialog = page.getByRole('dialog')
+ await expect(dialog, 'Enable extension dialog should be visible').toBeVisible()
+
+ // Select 'Create a new schema pgtap'
+ await dialog.getByRole('combobox').click()
+ await page.getByRole('option', { name: /Create a new schema/ }).click()
+
+ const enableWait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=extension-create')
+ const refetchWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await dialog.getByRole('button', { name: 'Enable extension' }).click()
+ await enableWait
+ await refetchWait
+
+ await expect(
+ page.getByText(`Extension "${EXTENSION_NAME}" is now enabled`),
+ 'Success toast should appear after enabling in new schema'
+ ).toBeVisible({ timeout: 15000 })
+
+ await expect(
+ row.getByRole('switch'),
+ 'Extension switch should be checked after enabling in new schema'
+ ).toBeChecked()
+
+ // Note: the created schema is owned by supabase_admin and cannot be dropped
+ // by the test query helper (runs as postgres). The schema is left empty after
+ // the extension is dropped and will be reused on subsequent runs via
+ // CREATE SCHEMA IF NOT EXISTS in the enable SQL.
+ await query(`DROP EXTENSION IF EXISTS ${EXTENSION_NAME} CASCADE;`)
+ })
+
+ test('cannot change the schema for extensions with a fixed default schema', async ({
+ page,
+ ref,
+ }) => {
+ const FIXED_SCHEMA_EXTENSION = 'pgmq'
+ const FIXED_SCHEMA = 'pgmq'
+
+ await query(`DROP EXTENSION IF EXISTS ${FIXED_SCHEMA_EXTENSION} CASCADE;`)
+
+ const extensionsWait = createApiResponseWaiter(
+ page,
+ 'pg-meta',
+ ref,
+ 'query?key=database-extensions'
+ )
+ await page.goto(toUrl(`/project/${env.PROJECT_REF}/database/extensions`))
+ await extensionsWait
+
+ await page.getByPlaceholder('Search for an extension').fill(FIXED_SCHEMA_EXTENSION)
+
+ const row = page.getByRole('row').filter({ hasText: FIXED_SCHEMA_EXTENSION }).first()
+ await expect(row, 'Extension row should be visible').toBeVisible()
+ await row.getByRole('switch').click()
+
+ const dialog = page.getByRole('dialog')
+ await expect(dialog, 'Enable extension dialog should be visible').toBeVisible()
+
+ // Schema selector (combobox) should NOT be present for fixed-schema extensions
+ await expect(
+ dialog.getByRole('combobox'),
+ 'Schema selector should not be present for extensions with a fixed default schema'
+ ).not.toBeVisible()
+
+ // A disabled input showing the fixed schema should be present instead
+ const schemaInput = dialog.getByRole('textbox')
+ await expect(schemaInput, 'Fixed schema input should be visible').toBeVisible()
+ await expect(schemaInput, 'Fixed schema input should be disabled').toBeDisabled()
+ await expect(
+ schemaInput,
+ 'Fixed schema input should display the required schema name'
+ ).toHaveValue(FIXED_SCHEMA)
+
+ // Helper text confirming the schema is required
+ await expect(
+ dialog.getByText(`Extension must be installed in the "${FIXED_SCHEMA}" schema.`),
+ 'Helper text should indicate the schema is required'
+ ).toBeVisible()
+
+ // Cancel without enabling
+ await dialog.getByRole('button', { name: 'Cancel' }).click()
+ await expect(dialog, 'Dialog should be closed after canceling').not.toBeVisible()
+ })
+})
+
test.describe('Database Enumerated Types', () => {
test('actions works as expected', async ({ page, ref }) => {
await page.goto(toUrl(`/project/${env.PROJECT_REF}/database/types?schema=public`))
diff --git a/packages/pg-meta/src/sql/studio/database/extensions.ts b/packages/pg-meta/src/sql/studio/database/extensions.ts
index a6b1605c67c..40d8ced591d 100644
--- a/packages/pg-meta/src/sql/studio/database/extensions.ts
+++ b/packages/pg-meta/src/sql/studio/database/extensions.ts
@@ -1,14 +1,23 @@
-import { ident, literal } from '../../../pg-format'
+import { ident } from '../../../pg-format'
import pgMetaExtensions from '../../../pg-meta-extensions'
-export const getDatabaseExtensionDefaultSchemaSQL = ({ extension }: { extension: string }) => {
- const sql = /* SQL */ `
-select name, version, schema from pg_available_extension_versions where name = ${literal(extension)} limit 1;
+export const getDatabaseExtensionsSQL = () =>
+ `
+SELECT
+ e.name,
+ n.nspname AS schema,
+ e.default_version,
+ x.extversion AS installed_version,
+ e.comment,
+ ev.schema AS default_version_schema
+FROM
+ pg_available_extensions e
+ LEFT JOIN pg_extension x ON e.name = x.extname
+ LEFT JOIN pg_namespace n ON x.extnamespace = n.oid
+ LEFT JOIN pg_available_extension_versions ev
+ ON ev.name = e.name AND ev.version = e.default_version;
`.trim()
- return sql
-}
-
export const getEnableDatabaseExtensionSQL = ({
schema,
name,