The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Migrate remaining requests to pg-meta API to use query endpoint (#47758)
Joshen Lim4901f081e57d
diff --git a/apps/studio/components/interfaces/Database/Tables/TableList.tsx b/apps/studio/components/interfaces/Database/Tables/TableList.tsxindex 9021dc12d54..55f6cc664d0 100644--- a/apps/studio/components/interfaces/Database/Tables/TableList.tsx+++ b/apps/studio/components/interfaces/Database/Tables/TableList.tsx@@ -137,7 +137,7 @@ export const TableList = ({{projectRef: project?.ref,connectionString: project?.connectionString,- schema: selectedSchema,+ schemas: [selectedSchema],},{select(views) {@@ -158,7 +158,7 @@ export const TableList = ({{projectRef: project?.ref,connectionString: project?.connectionString,- schema: selectedSchema,+ schemas: [selectedSchema],},{select(materializedViews) {@@ -181,7 +181,7 @@ export const TableList = ({{projectRef: project?.ref,connectionString: project?.connectionString,- schema: selectedSchema,+ schemas: [selectedSchema],},{select(foreignTables) {diff --git a/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx b/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsxindex 463829e8318..eb86f3453ca 100644--- a/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx+++ b/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx@@ -51,7 +51,7 @@ export const QueueTab = () => {const { data: policies } = useDatabasePoliciesQuery({projectRef: project?.ref,connectionString: project?.connectionString,- schema: 'pgmq',+ schemas: ['pgmq'],})const queuePolicies = (policies ?? []).filter((policy) => policy.table === queueRelname)diff --git a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsxindex cccf528fa35..d25050b658d 100644--- a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx+++ b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx@@ -63,7 +63,7 @@ export const RealtimeSettings = () => {const { data: policies, isSuccess: isSuccessPolicies } = useDatabasePoliciesQuery({projectRef,connectionString: project?.connectionString,- schema: 'realtime',+ schemas: ['realtime'],})const isFreePlan = organization?.plan.id === 'free'diff --git a/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx b/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsxindex 6f120dc6456..4be62e31def 100644--- a/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx+++ b/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx@@ -24,7 +24,7 @@ export const DeleteBucketModal = ({ visible, bucket, onClose }: DeleteBucketModaconst { data: policies } = useDatabasePoliciesQuery({projectRef: project?.ref,connectionString: project?.connectionString,- schema: 'storage',+ schemas: ['storage'],})const { mutateAsync: deletePolicy } = useDatabasePolicyDeleteMutation()diff --git a/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsx b/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsxindex ad3374cac2d..555d5cc5d7e 100644--- a/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsx+++ b/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsx@@ -74,7 +74,7 @@ export function PublicBucketWarning({ projectRef, bucketId }: PublicBucketWarninqueryKey: storageKeys.publicBucketsWithSelectPolicies(projectRef, bucketId),}),queryClient.invalidateQueries({- queryKey: databasePoliciesKeys.list(projectRef, 'storage'),+ queryKey: databasePoliciesKeys.list(projectRef, ['storage']),}),])track('storage_public_bucket_select_policy_removed', { bucketId })diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsxindex 79a7110b4b7..e57c66de9a9 100644--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsx+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsx@@ -68,7 +68,7 @@ export const StoragePolicies = () => {} = useDatabasePoliciesQuery({projectRef: project?.ref,connectionString: project?.connectionString,- schema: 'storage',+ schemas: ['storage'],})const isLoading = isLoadingBuckets || isLoadingPoliciesdiff --git a/apps/studio/components/interfaces/Storage/useBucketPolicyCount.ts b/apps/studio/components/interfaces/Storage/useBucketPolicyCount.tsindex afca034eab9..00d6b2eb273 100644--- a/apps/studio/components/interfaces/Storage/useBucketPolicyCount.ts+++ b/apps/studio/components/interfaces/Storage/useBucketPolicyCount.ts@@ -9,7 +9,7 @@ export function useBucketPolicyCount() {const { data: policiesData = [], isPending: isPoliciesPending } = useDatabasePoliciesQuery({projectRef: project?.ref,connectionString: project?.connectionString,- schema: 'storage',+ schemas: ['storage'],})const policyCountByBucket = useMemo(() => {diff --git a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsxindex 189c57fc216..0e8f86367dc 100644--- a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx@@ -105,7 +105,7 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp{projectRef: project?.ref,connectionString: project?.connectionString,- schema: table.schema,+ schemas: [table.schema],},{ enabled: !!table })diff --git a/apps/studio/data/database-columns/database-column-delete-mutation.ts b/apps/studio/data/database-columns/database-column-delete-mutation.tsindex 9ebfb635af9..dfe2745cd2f 100644--- a/apps/studio/data/database-columns/database-column-delete-mutation.ts+++ b/apps/studio/data/database-columns/database-column-delete-mutation.ts@@ -66,7 +66,7 @@ export const useDatabaseColumnDeleteMutation = ({// invalidate all views from this schema, not sure if this is needed since you can't actually delete a column// which has a view dependent on itqueryClient.invalidateQueries({- queryKey: viewKeys.listBySchema(projectRef, column.schema),+ queryKey: viewKeys.listBySchema(projectRef, [column.schema]),}),])diff --git a/apps/studio/data/database-policies/database-policies-query.ts b/apps/studio/data/database-policies/database-policies-query.tsindex 1a9bf0cea0a..8a447605223 100644--- a/apps/studio/data/database-policies/database-policies-query.ts+++ b/apps/studio/data/database-policies/database-policies-query.ts@@ -1,9 +1,9 @@-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'+import pgMeta, { type PGPolicy } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'+import { executeSql } from '../sql/execute-sql-mutation'import { databasePoliciesKeys } from './keys'import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'-import { get, handleError } from '@/data/fetchers'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants'import type { ResponseError, UseCustomQueryOptions } from '@/types'@@ -11,37 +11,27 @@ import type { ResponseError, UseCustomQueryOptions } from '@/types'type DatabasePoliciesVariables = {projectRef?: stringconnectionString?: string | null- schema?: string+ schemas?: string[]}export async function getDatabasePolicies(- { projectRef, connectionString, schema }: DatabasePoliciesVariables,- signal?: AbortSignal,- headersInit?: HeadersInit+ { projectRef, connectionString, schemas }: DatabasePoliciesVariables,+ 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}/policies', {- params: {- header: {- 'x-connection-encrypted': connectionString!,- 'x-pg-application-name': DEFAULT_PLATFORM_APPLICATION_NAME,- },- path: { ref: projectRef },- query: {- included_schemas: schema || '',- excluded_schemas: '',- },+ const { sql } = pgMeta.policies.list({ includedSchemas: schemas })+ const { result } = await executeSql(+ {+ projectRef,+ connectionString,+ sql,+ queryKey: ['policies', schemas],},- headers,- signal,- })+ signal+ )- if (error) handleError(error)- return data+ return result as PGPolicy[]}export type DatabasePoliciesData = Awaited<ReturnType<typeof getDatabasePolicies>>@@ -52,16 +42,16 @@ function markSavedPolicySafe(policy: DatabasePoliciesData[number]): Policy {}export const useDatabasePoliciesQuery = <TData = Policy[]>(- { projectRef, connectionString, schema }: DatabasePoliciesVariables,+ { projectRef, connectionString, schemas }: DatabasePoliciesVariables,{ enabled = true, ...options }: UseCustomQueryOptions<Policy[], DatabasePoliciesError, TData> = {}) => {const { data: project } = useSelectedProjectQuery()const isActive = project?.status === PROJECT_STATUS.ACTIVE_HEALTHYreturn useQuery<Policy[], DatabasePoliciesError, TData>({- queryKey: databasePoliciesKeys.list(projectRef, schema),+ queryKey: databasePoliciesKeys.list(projectRef, schemas),queryFn: ({ signal }) =>- getDatabasePolicies({ projectRef, connectionString, schema }, signal).then((data) =>+ getDatabasePolicies({ projectRef, connectionString, schemas }, signal).then((data) =>data.map(markSavedPolicySafe)),enabled: enabled && typeof projectRef !== 'undefined' && isActive,diff --git a/apps/studio/data/database-policies/keys.ts b/apps/studio/data/database-policies/keys.tsindex d1da950730c..08a3df7d2fc 100644--- a/apps/studio/data/database-policies/keys.ts+++ b/apps/studio/data/database-policies/keys.ts@@ -1,4 +1,4 @@export const databasePoliciesKeys = {- list: (projectRef: string | undefined, schema?: string) =>- ['projects', projectRef, 'database-policies', schema].filter(Boolean),+ list: (projectRef: string | undefined, schemas?: string[]) =>+ ['projects', projectRef, 'database-policies', schemas].filter(Boolean),}diff --git a/apps/studio/data/database-publications/database-publications-query.ts b/apps/studio/data/database-publications/database-publications-query.tsindex f6cd1d8c119..53c12472932 100644--- a/apps/studio/data/database-publications/database-publications-query.ts+++ b/apps/studio/data/database-publications/database-publications-query.ts@@ -1,8 +1,8 @@-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'+import pgMeta, { type PGPublication } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'+import { executeSql } from '../sql/execute-sql-mutation'import { databasePublicationsKeys } from './keys'-import { get, handleError } from '@/data/fetchers'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import type { ResponseError, UseCustomQueryOptions } from '@/types'@@ -17,25 +17,18 @@ export async function getDatabasePublications() {if (!projectRef) throw new Error('projectRef is required')- let headers = new Headers()- if (connectionString) headers.set('x-connection-encrypted', connectionString)-- const { data, error } = await get('/platform/pg-meta/{ref}/publications', {- params: {- header: {- 'x-connection-encrypted': connectionString!,- 'x-pg-application-name': DEFAULT_PLATFORM_APPLICATION_NAME,- },- path: {- ref: projectRef,- },+ const { sql } = pgMeta.publications.list()+ const { result } = await executeSql(+ {+ projectRef,+ connectionString,+ sql,+ queryKey: ['publications'].filter(Boolean),},- headers,- signal,- })+ signal+ )- if (error) handleError(error)- return data+ return result as PGPublication[]}export type DatabasePublicationsData = Awaited<ReturnType<typeof getDatabasePublications>>diff --git a/apps/studio/data/database-triggers/database-triggers-query.ts b/apps/studio/data/database-triggers/database-triggers-query.tsindex fd1d8da6632..c931c9d29bd 100644--- a/apps/studio/data/database-triggers/database-triggers-query.ts+++ b/apps/studio/data/database-triggers/database-triggers-query.ts@@ -1,9 +1,9 @@-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'+import pgMeta, { type PGTrigger } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'+import { executeSql } from '../sql/execute-sql-mutation'import { databaseTriggerKeys } from './keys'import type { PostgresTrigger } from '@/components/interfaces/Database/Triggers/TriggersList/TriggerList.utils'-import { get, handleError } from '@/data/fetchers'import type { ResponseError, UseCustomQueryOptions } from '@/types'function markSavedTriggerSafe(trigger: DatabaseTriggersData[number]): PostgresTrigger {@@ -13,46 +13,41 @@ function markSavedTriggerSafe(trigger: DatabaseTriggersData[number]): PostgresTrexport type DatabaseTriggersVariables = {projectRef?: stringconnectionString?: string | null+ schemas?: string[]}export async function getDatabaseTriggers(- { projectRef, connectionString }: DatabaseTriggersVariables,+ { projectRef, connectionString, schemas }: DatabaseTriggersVariables,signal?: AbortSignal) {if (!projectRef) throw new Error('projectRef is required')- let headers = new Headers()- if (connectionString) headers.set('x-connection-encrypted', connectionString)-- const { data, error } = await get('/platform/pg-meta/{ref}/triggers', {- params: {- header: {- 'x-connection-encrypted': connectionString!,- 'x-pg-application-name': DEFAULT_PLATFORM_APPLICATION_NAME,- },- path: { ref: projectRef },- query: undefined as any,+ const { sql } = pgMeta.triggers.list({ includedSchemas: schemas })+ const { result } = await executeSql(+ {+ projectRef,+ connectionString,+ sql,+ queryKey: ['triggers'],},- headers,- signal,- })+ signal+ )- if (error) handleError(error)- return data+ return result as PGTrigger[]}export type DatabaseTriggersData = Awaited<ReturnType<typeof getDatabaseTriggers>>export type DatabaseTriggersError = ResponseErrorexport const useDatabaseHooksQuery = <TData = DatabaseTriggersData>(- { projectRef, connectionString }: DatabaseTriggersVariables,+ { projectRef, connectionString, schemas }: DatabaseTriggersVariables,{enabled = true,...options}: UseCustomQueryOptions<DatabaseTriggersData, DatabaseTriggersError, TData> = {}) =>useQuery<DatabaseTriggersData, DatabaseTriggersError, TData>({- queryKey: databaseTriggerKeys.list(projectRef),+ queryKey: databaseTriggerKeys.list(projectRef, schemas),queryFn: ({ signal }) => getDatabaseTriggers({ projectRef, connectionString }, signal),select: (data) => {return data.filter((trigger) => {diff --git a/apps/studio/data/database-triggers/keys.ts b/apps/studio/data/database-triggers/keys.tsindex a81a321c433..3ccfe16136f 100644--- a/apps/studio/data/database-triggers/keys.ts+++ b/apps/studio/data/database-triggers/keys.ts@@ -1,5 +1,6 @@export const databaseTriggerKeys = {- list: (projectRef: string | undefined) => ['projects', projectRef, 'database-triggers'] as const,+ list: (projectRef: string | undefined, schemas?: string[]) =>+ ['projects', projectRef, 'database-triggers', schemas].filter(Boolean),resource: (projectRef: string | undefined, id: string | undefined) =>['projects', projectRef, 'resources', id] as const,}diff --git a/apps/studio/data/enumerated-types/enumerated-types-query.ts b/apps/studio/data/enumerated-types/enumerated-types-query.tsindex ec0b378094a..b494ac83e3f 100644--- a/apps/studio/data/enumerated-types/enumerated-types-query.ts+++ b/apps/studio/data/enumerated-types/enumerated-types-query.ts@@ -1,56 +1,52 @@-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'+import pgMeta, { type PGType } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'+import { executeSql } from '../sql/execute-sql-mutation'import { enumeratedTypesKeys } from './keys'import type { components } from '@/data/api'-import { get, handleError } from '@/data/fetchers'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type EnumeratedTypesVariables = {projectRef?: stringconnectionString?: string | null+ schemas?: string[]}export type EnumeratedType = components['schemas']['PostgresType']export async function getEnumeratedTypes(- { projectRef, connectionString }: EnumeratedTypesVariables,+ { projectRef, connectionString, schemas }: EnumeratedTypesVariables,signal?: AbortSignal) {if (!projectRef) throw new Error('projectRef is required')- let headers = new Headers()- if (connectionString) headers.set('x-connection-encrypted', connectionString)-- const { data, error } = await get('/platform/pg-meta/{ref}/types', {- params: {- header: {- 'x-connection-encrypted': connectionString!,- 'x-pg-application-name': DEFAULT_PLATFORM_APPLICATION_NAME,- },- path: { ref: projectRef },+ const { sql } = pgMeta.types.list({ includedSchemas: schemas })+ const { result } = await executeSql(+ {+ projectRef,+ connectionString,+ sql,+ queryKey: ['types'],},- headers: Object.fromEntries(headers),- signal,- })+ signal+ )- if (error) handleError(error)- return data+ return result as PGType[]}export type EnumeratedTypesData = Awaited<ReturnType<typeof getEnumeratedTypes>>export type EnumeratedTypesError = ResponseErrorexport const useEnumeratedTypesQuery = <TData = EnumeratedTypesData>(- { projectRef, connectionString }: EnumeratedTypesVariables,+ { projectRef, connectionString, schemas }: EnumeratedTypesVariables,{enabled = true,...options}: UseCustomQueryOptions<EnumeratedTypesData, EnumeratedTypesError, TData> = {}) =>useQuery<EnumeratedTypesData, EnumeratedTypesError, TData>({- queryKey: enumeratedTypesKeys.list(projectRef),- queryFn: ({ signal }) => getEnumeratedTypes({ projectRef, connectionString }, signal),+ queryKey: enumeratedTypesKeys.list(projectRef, schemas),+ queryFn: ({ signal }) => getEnumeratedTypes({ projectRef, connectionString, schemas }, signal),enabled: enabled && typeof projectRef !== 'undefined',...options,})diff --git a/apps/studio/data/enumerated-types/keys.ts b/apps/studio/data/enumerated-types/keys.tsindex bea10c943bc..9ca7a288ffa 100644--- a/apps/studio/data/enumerated-types/keys.ts+++ b/apps/studio/data/enumerated-types/keys.ts@@ -1,3 +1,4 @@export const enumeratedTypesKeys = {- list: (projectRef: string | undefined) => ['projects', projectRef, 'enumerated-types'] as const,+ list: (projectRef: string | undefined, schemas?: string[]) =>+ ['projects', projectRef, 'enumerated-types', schemas].filter(Boolean),}diff --git a/apps/studio/data/foreign-tables/foreign-tables-query.ts b/apps/studio/data/foreign-tables/foreign-tables-query.tsindex 0a3d1e91899..99a347efbcf 100644--- a/apps/studio/data/foreign-tables/foreign-tables-query.ts+++ b/apps/studio/data/foreign-tables/foreign-tables-query.ts@@ -9,19 +9,19 @@ import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ForeignTablesVariables = {projectRef?: stringconnectionString?: string | null- schema?: string+ schemas?: string[]}export async function getForeignTables(- { projectRef, connectionString, schema }: ForeignTablesVariables,+ { projectRef, connectionString, schemas }: ForeignTablesVariables,signal?: AbortSignal) {const { result } = await executeSql({projectRef,connectionString,- sql: pgMeta.foreignTables.list(schema ? { includedSchemas: [schema] } : undefined).sql,- queryKey: ['foreign-tables', schema],+ sql: pgMeta.foreignTables.list({ includedSchemas: schemas }).sql,+ queryKey: ['foreign-tables', schemas].filter(Boolean),},signal)@@ -33,17 +33,17 @@ export type ForeignTablesData = Awaited<ReturnType<typeof getForeignTables>>export type ForeignTablesError = ResponseErrorexport const useForeignTablesQuery = <TData = ForeignTablesData>(- { projectRef, connectionString, schema }: ForeignTablesVariables,+ { projectRef, connectionString, schemas }: ForeignTablesVariables,{enabled = true,...options}: UseCustomQueryOptions<ForeignTablesData, ForeignTablesError, TData> = {}) =>useQuery<ForeignTablesData, ForeignTablesError, TData>({- queryKey: schema- ? foreignTableKeys.listBySchema(projectRef, schema)+ queryKey: schemas+ ? foreignTableKeys.listBySchema(projectRef, schemas): foreignTableKeys.list(projectRef),- queryFn: ({ signal }) => getForeignTables({ projectRef, connectionString, schema }, signal),+ queryFn: ({ signal }) => getForeignTables({ projectRef, connectionString, schemas }, signal),enabled: enabled && typeof projectRef !== 'undefined',...options,})diff --git a/apps/studio/data/foreign-tables/keys.ts b/apps/studio/data/foreign-tables/keys.tsindex 1d92f2a2046..3a453f95d37 100644--- a/apps/studio/data/foreign-tables/keys.ts+++ b/apps/studio/data/foreign-tables/keys.ts@@ -1,5 +1,5 @@export const foreignTableKeys = {list: (projectRef: string | undefined) => ['projects', projectRef, 'foreignTables'] as const,- listBySchema: (projectRef: string | undefined, schema: string) =>- [...foreignTableKeys.list(projectRef), schema] as const,+ listBySchema: (projectRef: string | undefined, schemas?: string[]) =>+ [...foreignTableKeys.list(projectRef), schemas].filter(Boolean),}diff --git a/apps/studio/data/materialized-views/keys.ts b/apps/studio/data/materialized-views/keys.tsindex 52471531801..0c1974c1e17 100644--- a/apps/studio/data/materialized-views/keys.ts+++ b/apps/studio/data/materialized-views/keys.ts@@ -1,5 +1,5 @@export const materializedViewKeys = {list: (projectRef: string | undefined) => ['projects', projectRef, 'materializedViews'] as const,- listBySchema: (projectRef: string | undefined, schema: string) =>- [...materializedViewKeys.list(projectRef), schema] as const,+ listBySchema: (projectRef: string | undefined, schemas?: string[]) =>+ [...materializedViewKeys.list(projectRef), schemas].filter(Boolean),}diff --git a/apps/studio/data/materialized-views/materialized-view-delete-mutation.ts b/apps/studio/data/materialized-views/materialized-view-delete-mutation.tsindex de7dae828c0..a77ae8783a7 100644--- a/apps/studio/data/materialized-views/materialized-view-delete-mutation.ts+++ b/apps/studio/data/materialized-views/materialized-view-delete-mutation.ts@@ -60,7 +60,7 @@ export const useMaterializedViewDeleteMutation = ({await Promise.all([queryClient.invalidateQueries({ queryKey: tableEditorKeys.tableEditor(projectRef, id) }),queryClient.invalidateQueries({- queryKey: materializedViewKeys.listBySchema(projectRef, schema),+ queryKey: materializedViewKeys.listBySchema(projectRef, [schema]),}),queryClient.invalidateQueries({ queryKey: entityTypeKeys.list(projectRef) }),])diff --git a/apps/studio/data/materialized-views/materialized-views-query.ts b/apps/studio/data/materialized-views/materialized-views-query.tsindex 78407c7b284..a7d1cc91de4 100644--- a/apps/studio/data/materialized-views/materialized-views-query.ts+++ b/apps/studio/data/materialized-views/materialized-views-query.ts@@ -1,61 +1,53 @@-import type { PGMaterializedView } from '@supabase/pg-meta'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'+import pgMeta, { type PGMaterializedView } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'+import { executeSql } from '../sql/execute-sql-mutation'import { materializedViewKeys } from './keys'-import { get, handleError } from '@/data/fetchers'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type MaterializedViewsVariables = {projectRef?: stringconnectionString?: string | null- schema?: string+ schemas?: string[]}export async function getMaterializedViews(- { projectRef, connectionString, schema }: MaterializedViewsVariables,+ { projectRef, connectionString, schemas }: MaterializedViewsVariables,signal?: AbortSignal) {if (!projectRef) throw new Error('projectRef is required')- let headers = new Headers()- if (connectionString) headers.set('x-connection-encrypted', connectionString)-- const { data, error } = await get('/platform/pg-meta/{ref}/materialized-views', {- params: {- header: {- 'x-connection-encrypted': connectionString!,- 'x-pg-application-name': DEFAULT_PLATFORM_APPLICATION_NAME,- },- path: { ref: projectRef },- query: {- included_schemas: schema || '',- include_columns: true,- } as any,+ const { sql } = pgMeta.materializedViews.list({ includedSchemas: schemas })++ const { result } = await executeSql(+ {+ projectRef,+ connectionString,+ sql,+ queryKey: ['materialized-views', schemas].filter(Boolean),},- headers,- signal,- })+ signal+ )- if (error) handleError(error)- return data as PGMaterializedView[]+ return result as PGMaterializedView[]}export type MaterializedViewsData = Awaited<ReturnType<typeof getMaterializedViews>>export type MaterializedViewsError = ResponseErrorexport const useMaterializedViewsQuery = <TData = MaterializedViewsData>(- { projectRef, connectionString, schema }: MaterializedViewsVariables,+ { projectRef, connectionString, schemas }: MaterializedViewsVariables,{enabled = true,...options}: UseCustomQueryOptions<MaterializedViewsData, MaterializedViewsError, TData> = {}) =>useQuery<MaterializedViewsData, MaterializedViewsError, TData>({- queryKey: schema- ? materializedViewKeys.listBySchema(projectRef, schema)+ queryKey: schemas+ ? materializedViewKeys.listBySchema(projectRef, schemas): materializedViewKeys.list(projectRef),- queryFn: ({ signal }) => getMaterializedViews({ projectRef, connectionString, schema }, signal),+ queryFn: ({ signal }) =>+ getMaterializedViews({ projectRef, connectionString, schemas }, signal),enabled: enabled && typeof projectRef !== 'undefined',staleTime: 0,...options,diff --git a/apps/studio/data/tables/table-delete-mutation.ts b/apps/studio/data/tables/table-delete-mutation.tsindex 41b5dc6fbf5..5620886d02f 100644--- a/apps/studio/data/tables/table-delete-mutation.ts+++ b/apps/studio/data/tables/table-delete-mutation.ts@@ -62,7 +62,7 @@ export const useTableDeleteMutation = ({}),queryClient.invalidateQueries({ queryKey: entityTypeKeys.list(projectRef) }),// invalidate all views from this schema- queryClient.invalidateQueries({ queryKey: viewKeys.listBySchema(projectRef, schema) }),+ queryClient.invalidateQueries({ queryKey: viewKeys.listBySchema(projectRef, [schema]) }),])await onSuccess?.(data, variables, context)diff --git a/apps/studio/data/views/keys.ts b/apps/studio/data/views/keys.tsindex df314bb23af..72ccae62e46 100644--- a/apps/studio/data/views/keys.ts+++ b/apps/studio/data/views/keys.ts@@ -1,5 +1,5 @@export const viewKeys = {list: (projectRef: string | undefined) => ['projects', projectRef, 'views'] as const,- listBySchema: (projectRef: string | undefined, schema: string) =>- [...viewKeys.list(projectRef), schema] as const,+ listBySchema: (projectRef: string | undefined, schemas?: string[]) =>+ [...viewKeys.list(projectRef), schemas].filter(Boolean),}diff --git a/apps/studio/data/views/view-delete-mutation.ts b/apps/studio/data/views/view-delete-mutation.tsindex 5cca346058f..24ea777a66d 100644--- a/apps/studio/data/views/view-delete-mutation.ts+++ b/apps/studio/data/views/view-delete-mutation.ts@@ -55,7 +55,7 @@ export const useViewDeleteMutation = ({const { id, projectRef, schema } = variablesawait Promise.all([queryClient.invalidateQueries({ queryKey: tableEditorKeys.tableEditor(projectRef, id) }),- queryClient.invalidateQueries({ queryKey: viewKeys.listBySchema(projectRef, schema) }),+ queryClient.invalidateQueries({ queryKey: viewKeys.listBySchema(projectRef, [schema]) }),queryClient.invalidateQueries({ queryKey: entityTypeKeys.list(projectRef) }),])diff --git a/apps/studio/data/views/views-query.ts b/apps/studio/data/views/views-query.tsindex bc784d02453..58b99671bb5 100644--- a/apps/studio/data/views/views-query.ts+++ b/apps/studio/data/views/views-query.ts@@ -1,55 +1,46 @@-import type { PGView } from '@supabase/pg-meta'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'+import pgMeta, { type PGView } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'+import { executeSql } from '../sql/execute-sql-mutation'import { viewKeys } from './keys'-import { get, handleError } from '@/data/fetchers'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ViewsVariables = {projectRef?: stringconnectionString?: string | null- schema?: string+ schemas?: string[]}export async function getViews(- { projectRef, connectionString, schema }: ViewsVariables,+ { projectRef, connectionString, schemas }: ViewsVariables,signal?: AbortSignal) {if (!projectRef) throw new Error('projectRef is required')- let headers = new Headers()- if (connectionString) headers.set('x-connection-encrypted', connectionString)-- const { data, error } = await get('/platform/pg-meta/{ref}/views', {- params: {- header: {- 'x-connection-encrypted': connectionString!,- 'x-pg-application-name': DEFAULT_PLATFORM_APPLICATION_NAME,- },- path: { ref: projectRef },- query: {- included_schemas: schema || '',- } as any,+ const { sql } = pgMeta.views.list({ includedSchemas: schemas })+ const { result } = await executeSql(+ {+ projectRef,+ connectionString,+ sql,+ queryKey: ['views', schemas].filter(Boolean),},- headers,- signal,- })+ signal+ )- if (error) handleError(error)- return data as PGView[]+ return result as PGView[]}export type ViewsData = Awaited<ReturnType<typeof getViews>>export type ViewsError = ResponseErrorexport const useViewsQuery = <TData = ViewsData>(- { projectRef, connectionString, schema }: ViewsVariables,+ { projectRef, connectionString, schemas }: ViewsVariables,{ enabled = true, ...options }: UseCustomQueryOptions<ViewsData, ViewsError, TData> = {}) =>useQuery<ViewsData, ViewsError, TData>({- queryKey: schema ? viewKeys.listBySchema(projectRef, schema) : viewKeys.list(projectRef),- queryFn: ({ signal }) => getViews({ projectRef, connectionString, schema }, signal),+ queryKey: schemas ? viewKeys.listBySchema(projectRef, schemas) : viewKeys.list(projectRef),+ queryFn: ({ signal }) => getViews({ projectRef, connectionString, schemas }, signal),enabled: enabled && typeof projectRef !== 'undefined',staleTime: 0,...options,diff --git a/apps/studio/lib/ai/tools/fallback-tools.ts b/apps/studio/lib/ai/tools/fallback-tools.tsindex 2a3ed2329a6..b8479f9020e 100644--- a/apps/studio/lib/ai/tools/fallback-tools.ts+++ b/apps/studio/lib/ai/tools/fallback-tools.ts@@ -90,10 +90,9 @@ export const getFallbackTools = ({{projectRef,connectionString,- schema: schemas?.join(','),+ schemas,},- undefined,- headers+ undefined): []diff --git a/apps/studio/lib/ai/tools/index.ts b/apps/studio/lib/ai/tools/index.tsindex 5907292062f..0e3bf9257a8 100644--- a/apps/studio/lib/ai/tools/index.ts+++ b/apps/studio/lib/ai/tools/index.ts@@ -69,7 +69,6 @@ export const getTools = async ({...getSchemaTools({projectRef,connectionString,- authorization,}),...(baseUrl ? getIncidentTools({ baseUrl }) : {}),}diff --git a/apps/studio/lib/ai/tools/schema-tools.ts b/apps/studio/lib/ai/tools/schema-tools.tsindex 6de53ab782e..7e92adccb35 100644--- a/apps/studio/lib/ai/tools/schema-tools.ts+++ b/apps/studio/lib/ai/tools/schema-tools.ts@@ -6,11 +6,9 @@ import { getDatabasePolicies } from '@/data/database-policies/database-policies-export const getSchemaTools = ({projectRef,connectionString,- authorization,}: {projectRef: stringconnectionString: string- authorization?: string}) => ({list_policies: tool({description: 'Get existing RLS policies for a given schema',@@ -22,13 +20,9 @@ export const getSchemaTools = ({{projectRef,connectionString,- schema: schemas?.join(','),+ schemas,},- undefined,- {- 'Content-Type': 'application/json',- ...(authorization && { Authorization: authorization }),- }+ undefined)const formattedPolicies = datadiff --git a/apps/studio/pages/project/[ref]/database/policies.tsx b/apps/studio/pages/project/[ref]/database/policies.tsxindex 654a48de3fb..766d3ac6afa 100644--- a/apps/studio/pages/project/[ref]/database/policies.tsx+++ b/apps/studio/pages/project/[ref]/database/policies.tsx@@ -171,7 +171,7 @@ const DatabasePoliciesPage: NextPageWithLayout = () => {} = useDatabasePoliciesQuery({projectRef: project?.ref,connectionString: project?.connectionString,- schema,+ schemas: [schema],})const selectedPolicyToEdit = policies.find((policy) => policy.id.toString() === selectedIdToEdit)diff --git a/e2e/studio/features/database.spec.ts b/e2e/studio/features/database.spec.tsindex 330a4007b4d..0dff28610c5 100644--- a/e2e/studio/features/database.spec.ts+++ b/e2e/studio/features/database.spec.ts@@ -540,7 +540,7 @@ test.describe('Database', () => {test.describe('Triggers', () => {test('actions works as expected', async ({ page, ref }) => {- const triggersLoadWait = createApiResponseWaiter(page, 'pg-meta', ref, 'triggers')+ const triggersLoadWait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=triggers')await page.goto(toUrl(`/project/${env.PROJECT_REF}/database/triggers?schema=public`))// Wait for database triggers to be populated@@ -582,7 +582,12 @@ test.describe('Database', () => {})- const triggersCrudLoadWait = createApiResponseWaiter(page, 'pg-meta', ref, 'triggers')+ const triggersCrudLoadWait = createApiResponseWaiter(+ page,+ 'pg-meta',+ ref,+ 'query?key=triggers'+ )await page.goto(toUrl(`/project/${env.PROJECT_REF}/database/triggers?schema=public`))// Wait for database triggers to be populated@@ -1190,7 +1195,7 @@ test.describe('Database Enumerated Types', () => {await page.locator('input[name="values.0.value"]').fill(databaseEnumValue1Name)await page.getByRole('button', { name: 'Add value' }).click()await page.locator('input[name="values.1.value"]').fill(databaseEnumValue2Name)- const enumCreateWait = createApiResponseWaiter(page, 'pg-meta', ref, 'types')+ const enumCreateWait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=types')await page.getByRole('button', { name: 'Create type' }).click()// Wait for enum response to be completed and validate it@@ -1224,7 +1229,7 @@ test.describe('Database Enumerated Types', () => {await page.locator('input[name="values.0.value"]').fill(quotedEnumValue1Name)await page.getByRole('button', { name: 'Add value' }).click()await page.locator('input[name="values.1.value"]').fill(quotedEnumValue2Name)- const quotedEnumCreateWait = createApiResponseWaiter(page, 'pg-meta', ref, 'types')+ const quotedEnumCreateWait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=types')await page.getByRole('button', { name: 'Create type' }).click()await quotedEnumCreateWaitdiff --git a/e2e/studio/features/rls-policies.spec.ts b/e2e/studio/features/rls-policies.spec.tsindex 6d6c9195c65..ff5f31fd02f 100644--- a/e2e/studio/features/rls-policies.spec.ts+++ b/e2e/studio/features/rls-policies.spec.ts@@ -9,7 +9,7 @@ import { createApiResponseWaiter } from '../utils/wait-for-response.js'* Helper function to navigate to policies page and wait for it to load*/const navigateToPoliciesPage = async (page: Page, ref: string) => {- const wait = createApiResponseWaiter(page, 'pg-meta', ref, 'policies')+ const wait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=policies')await page.goto(toUrl(`/project/${ref}/database/policies`))await waitawait page.waitForTimeout(500)diff --git a/e2e/studio/features/table-editor.spec.ts b/e2e/studio/features/table-editor.spec.tsindex c328a8cced8..5b898591a02 100644--- a/e2e/studio/features/table-editor.spec.ts+++ b/e2e/studio/features/table-editor.spec.ts@@ -33,7 +33,7 @@ const deleteTable = async (page: Page, ref: string, tableName: string) => {}const deleteEnumIfExist = async (page: Page, ref: string, enumName: string) => {- const loadTypesPromise = waitForApiResponse(page, 'pg-meta', ref, `types`)+ const loadTypesPromise = waitForApiResponse(page, 'pg-meta', ref, `query?key=types`)await page.goto(toUrl(`/project/${ref}/database/types?schema=public`))await loadTypesPromiseexpect(page.getByText('public').first()).toBeVisible()diff --git a/packages/pg-meta/src/index.ts b/packages/pg-meta/src/index.tsindex 98ea5cbbc9f..2ca2ea44c36 100644--- a/packages/pg-meta/src/index.ts+++ b/packages/pg-meta/src/index.ts@@ -13,7 +13,7 @@ import schemas from './pg-meta-schemas'import tablePrivileges from './pg-meta-table-privileges'import * as tables from './pg-meta-tables'import triggers from './pg-meta-triggers'-import types from './pg-meta-types'+import * as types from './pg-meta-types'import version from './pg-meta-version'import views from './pg-meta-views'import * as query from './query/index'@@ -54,6 +54,7 @@ export type { PGMaterializedView } from './pg-meta-materialized-views'export type { PGForeignTable } from './pg-meta-foreign-tables'export type { PGSchema } from './pg-meta-schemas'export type { PGPublication } from './pg-meta-publications'+export type { PGType } from './pg-meta-types'export default {roles,diff --git a/packages/pg-meta/src/pg-meta-types.ts b/packages/pg-meta/src/pg-meta-types.tsindex 547070d51d2..095db69a614 100644--- a/packages/pg-meta/src/pg-meta-types.ts+++ b/packages/pg-meta/src/pg-meta-types.ts@@ -21,6 +21,7 @@ const pgTypeZod = z.object({})const pgTypeArrayZod = z.array(pgTypeZod)+export type PGType = z.infer<typeof pgTypeZod>function list({includeArrayTypes = false,@@ -68,7 +69,4 @@ function list({}}-export default {- list,- zod: pgTypeZod,-}+export { list }