mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 11:25:06 +03:00
## Summary - Converts ~27 `executeSql` call sites in `apps/studio/data/**` to build SQL through `safeSql` / `ident` / `literal` / `keyword` / `joinSqlFragments` instead of raw template-string interpolation. - Tightens the `useDatabaseCronJobCreateMutation` and `useDatabaseEventTriggerCreateMutation` `sql`/`query` parameter types from `string` to `SafeSqlFragment` (callers already produce one). - Updates `getDeleteEnumeratedTypeSQL` in `packages/pg-meta` to return `SafeSqlFragment`. - Fixes a bug noticed while testing where Queues integration does not correctly handle queues with uppercase names. ## Pages to manually test - Integrations > Cron Jobs - Integrations > Queues - Database > Triggers > Event Triggers - Database > Indexes - Reports > Query Performance - Storage <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes * **Bug Fixes** * Queue lookups now correctly handle case-insensitive queue names. * Queue table references are now properly managed and consistently applied throughout the queue management interface. * Improved queue name display normalization in the user interface. * **Chores** * Enhanced SQL query safety across the database layer through parameterized query construction and safer templating approaches. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
65 lines
1.7 KiB
TypeScript
65 lines
1.7 KiB
TypeScript
import { safeSql } from '@supabase/pg-meta/src/pg-format'
|
|
import { useQuery } from '@tanstack/react-query'
|
|
|
|
import { configKeys } from './keys'
|
|
import { executeSql } from '@/data/sql/execute-sql-query'
|
|
import type { ResponseError, UseCustomQueryOptions } from '@/types'
|
|
|
|
export type DiskBreakdownVariables = {
|
|
projectRef?: string
|
|
connectionString?: string | null
|
|
}
|
|
|
|
type DiskBreakdownResult = {
|
|
db_size_bytes: number
|
|
wal_size_bytes: number
|
|
}
|
|
|
|
export async function getDiskBreakdown(
|
|
{ projectRef, connectionString }: DiskBreakdownVariables,
|
|
signal?: AbortSignal
|
|
) {
|
|
if (!projectRef) throw new Error('Project ref is required')
|
|
if (!connectionString) throw new Error('Connection string is required')
|
|
|
|
const { result } = await executeSql(
|
|
{
|
|
projectRef,
|
|
connectionString,
|
|
sql: safeSql`
|
|
SELECT
|
|
(
|
|
SELECT
|
|
SUM(pg_database_size(pg_database.datname)) AS db_size_bytes
|
|
FROM
|
|
pg_database
|
|
),
|
|
(
|
|
SELECT SUM(size)
|
|
FROM
|
|
pg_ls_waldir()
|
|
) AS wal_size_bytes`,
|
|
},
|
|
signal
|
|
)
|
|
|
|
return result[0] as DiskBreakdownResult
|
|
}
|
|
|
|
export type DiskBreakdownData = Awaited<ReturnType<typeof getDiskBreakdown>>
|
|
export type DiskBreakdownError = ResponseError
|
|
|
|
export const useDiskBreakdownQuery = <TData = DiskBreakdownData>(
|
|
{ projectRef, connectionString }: DiskBreakdownVariables,
|
|
{
|
|
enabled = true,
|
|
...options
|
|
}: UseCustomQueryOptions<DiskBreakdownData, DiskBreakdownError, TData> = {}
|
|
) =>
|
|
useQuery<DiskBreakdownData, DiskBreakdownError, TData>({
|
|
queryKey: configKeys.diskBreakdown(projectRef),
|
|
queryFn: ({ signal }) => getDiskBreakdown({ projectRef, connectionString }, signal),
|
|
enabled: enabled && typeof projectRef !== 'undefined',
|
|
...options,
|
|
})
|