The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix: Include security_invoker in definition (#44936)
Vaibhavfdf873272772
diff --git a/apps/studio/components/interfaces/TableGridEditor/TableDefinition.tsx b/apps/studio/components/interfaces/TableGridEditor/TableDefinition.tsxindex dbf98df8116..bec36230955 100644--- a/apps/studio/components/interfaces/TableGridEditor/TableDefinition.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/TableDefinition.tsx@@ -9,13 +9,7 @@ import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import { Footer } from '@/components/grid/components/footer/Footer'import { useTableDefinitionQuery } from '@/data/database/table-definition-query'import { useViewDefinitionQuery } from '@/data/database/view-definition-query'-import {- Entity,- isMaterializedView,- isTableLike,- isView,- isViewLike,-} from '@/data/table-editor/table-editor-types'+import { Entity, isTableLike, isViewLike } from '@/data/table-editor/table-editor-types'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { formatSql } from '@/lib/formatSql'import { timeout } from '@/lib/helpers'@@ -34,6 +28,7 @@ export const TableDefinition = ({ entity }: TableDefinitionProps) => {const viewResult = useViewDefinitionQuery({id: entity?.id,+ includeCreateStatement: true,projectRef: project?.ref,connectionString: project?.connectionString,},@@ -55,14 +50,8 @@ export const TableDefinition = ({ entity }: TableDefinitionProps) => {const { data: definition, isLoading } = isViewLike(entity) ? viewResult : tableResult- const prepend = isView(entity)- ? `create view ${entity.schema}.${entity.name} as\n`- : isMaterializedView(entity)- ? `create materialized view ${entity.schema}.${entity.name} as\n`- : ''-const formattedDefinition = useMemo(- () => (definition ? formatSql(prepend + definition) : undefined),+ () => (definition ? formatSql(definition) : undefined),[definition])diff --git a/apps/studio/data/database/keys.ts b/apps/studio/data/database/keys.tsindex 45fd39dc825..aa6033e2977 100644--- a/apps/studio/data/database/keys.ts+++ b/apps/studio/data/database/keys.ts@@ -17,8 +17,8 @@ export const databaseKeys = {['projects', projectRef, 'entity-definitions', schemas] as const,tableDefinition: (projectRef: string | undefined, id?: number) =>['projects', projectRef, 'table-definition', id] as const,- viewDefinition: (projectRef: string | undefined, id?: number) =>- ['projects', projectRef, 'view-definition', id] as const,+ viewDefinition: (projectRef: string | undefined, id?: number, includeCreateStatement?: boolean) =>+ ['projects', projectRef, 'view-definition', id, includeCreateStatement ?? false] as const,backups: (projectRef: string | undefined) =>['projects', projectRef, 'database', 'backups'] as const,poolingConfiguration: (projectRef: string | undefined) =>diff --git a/apps/studio/data/database/view-definition-query.ts b/apps/studio/data/database/view-definition-query.tsindex 6618f488c75..6c23dd235b7 100644--- a/apps/studio/data/database/view-definition-query.ts+++ b/apps/studio/data/database/view-definition-query.ts@@ -7,6 +7,7 @@ import { UseCustomQueryOptions } from '@/types'type GetViewDefinitionArgs = {id?: number+ includeCreateStatement?: boolean}export type ViewDefinitionVariables = GetViewDefinitionArgs & {@@ -15,18 +16,18 @@ export type ViewDefinitionVariables = GetViewDefinitionArgs & {}export async function getViewDefinition(- { projectRef, connectionString, id }: ViewDefinitionVariables,+ { projectRef, connectionString, id, includeCreateStatement }: ViewDefinitionVariables,signal?: AbortSignal) {if (!id) throw new Error('View ID is required')- const sql = getViewDefinitionSql({ id })+ const sql = getViewDefinitionSql({ id, includeCreateStatement })const { result } = await executeSql({projectRef,connectionString,sql,- queryKey: ['view-definition', id],+ queryKey: ['view-definition', id, includeCreateStatement ?? false],},signal)@@ -38,15 +39,16 @@ export type ViewDefinitionData = stringexport type ViewDefinitionError = ExecuteSqlErrorexport const useViewDefinitionQuery = <TData = ViewDefinitionData>(- { projectRef, connectionString, id }: ViewDefinitionVariables,+ { projectRef, connectionString, id, includeCreateStatement }: ViewDefinitionVariables,{enabled = true,...options}: UseCustomQueryOptions<ViewDefinitionData, ViewDefinitionError, TData> = {}) =>useQuery<ViewDefinitionData, ViewDefinitionError, TData>({- queryKey: databaseKeys.viewDefinition(projectRef, id),- queryFn: ({ signal }) => getViewDefinition({ projectRef, connectionString, id }, signal),+ queryKey: databaseKeys.viewDefinition(projectRef, id, includeCreateStatement),+ queryFn: ({ signal }) =>+ getViewDefinition({ projectRef, connectionString, id, includeCreateStatement }, signal),enabled:enabled && typeof projectRef !== 'undefined' && typeof id !== 'undefined' && !isNaN(id),...options,diff --git a/e2e/studio/features/table-editor.spec.ts b/e2e/studio/features/table-editor.spec.tsindex 75a6d8462c3..4f1a3014db9 100644--- a/e2e/studio/features/table-editor.spec.ts+++ b/e2e/studio/features/table-editor.spec.ts@@ -488,6 +488,63 @@ testRunner('table editor', () => {)})+ test('view definition preserves security_invoker for security invoker views', async ({+ page,+ ref,+ }) => {+ const tableName = `pw_view_def_source_${test.info().parallelIndex}`+ const viewName = `pw_view_def_invoker_${test.info().parallelIndex}`++ await using _ = await withSetupCleanup(+ async () => {+ await query(`drop view if exists public.${viewName};`)+ await dropTable(tableName)++ await query(`+ create table public.${tableName} (+ id bigint generated by default as identity primary key,+ secret text+ );++ alter table public.${tableName} enable row level security;++ create policy "${tableName}_anon_denied"+ on public.${tableName}+ for select+ to anon+ using (false);++ create view public.${viewName} with (security_invoker = true) as+ select id, secret+ from public.${tableName};+ `)+ },+ async () => {+ await query(`drop view if exists public.${viewName};`)+ await dropTable(tableName)+ }+ )++ await page.goto(toUrl(`/project/${ref}/editor?schema=public`))+ await waitForTableToLoad(page, ref)++ await page.getByRole('button', { name: `View ${viewName}`, exact: true }).click()++ const definitionWait = waitForApiResponse(page, 'pg-meta', ref, 'query?key=view-definition-')+ await page.getByText('definition', { exact: true }).click()+ await definitionWait++ await expect(page.locator('.view-lines')).toContainText(`create view public.${viewName}`)+ await expect(page.locator('.view-lines')).toContainText(`security_invoker = true`)++ const openInSqlEditorLink = page.getByRole('link', { name: 'Open in SQL Editor' })+ await expect(openInSqlEditorLink).toHaveAttribute('href', /security_invoker%20%3D%20true/)+ await openInSqlEditorLink.click()+ await page.waitForURL(/\/sql\/new/)+ await expect(page.locator('.view-lines')).toContainText(`create view public.${viewName}`)+ await expect(page.locator('.view-lines')).toContainText(`security_invoker = true`)+ })+test('sorting rows works as expected', async ({ page, ref }) => {const tableName = 'pw_table_sorting'const colName = 'pw_column'diff --git a/packages/pg-meta/src/sql/studio/database/views.ts b/packages/pg-meta/src/sql/studio/database/views.tsindex 0594e73fd04..9a6d5ec267d 100644--- a/packages/pg-meta/src/sql/studio/database/views.ts+++ b/packages/pg-meta/src/sql/studio/database/views.ts@@ -1,19 +1,48 @@-export const getViewDefinitionSql = ({ id }: { id: number }) => {+export const getViewDefinitionSql = ({+ id,+ includeCreateStatement = false,+}: {+ id: number+ includeCreateStatement?: boolean+}) => {if (!id) {throw new Error('id is required')}+ const definitionSql = includeCreateStatement+ ? /* SQL */ `+ concat(+ case t.relkind+ when 'm' then 'create materialized view '+ else 'create view '+ end,+ quote_ident(t.schema),+ '.',+ quote_ident(t.name),+ case+ when t.reloptions is not null and array_length(t.reloptions, 1) > 0+ then ' with (' || array_to_string(t.reloptions, ', ') || ')'+ else ''+ end,+ E' as\n',+ pg_get_viewdef(t.regclass, true)+ )+ `.trim()+ : 'pg_get_viewdef(t.regclass, true)'+const sql = /* SQL */ `with table_info as (select+ c.relkind,n.nspname::text as schema,c.relname::text as name,+ c.reloptions,to_regclass(concat('"', n.nspname, '"."', c.relname, '"')) as regclassfrom pg_class cjoin pg_namespace n on n.oid = c.relnamespacewhere c.oid = ${id})- select pg_get_viewdef(t.regclass, true) as definition+ select ${definitionSql} as definitionfrom table_info t`.trim()