mirror of
https://github.com/supabase/supabase.git
synced 2026-10-11 04:15:04 +03:00
Third of a stack. **Stacked on #49070** (which is stacked on #49069) — review those first. Base retargets automatically as each merges. Mechanical throughout; no behavior change. ## The problem Three types described where a query runs, and no two agreed: | | shape | |---|---| | `CellSource` (registry) | `{ id, type, parameters: { … } }` — `id` and `type` always held the same literal | | `QuerySource` (SQL editor) | `{ type: 'database' } \| { type: 'logs', dateRange }` | | notebook cells | flat per-backend fields, neither of the above | Anything crossing between them needed a translation that dropped fields on the way — which is how a notebook cell's replica selection had nowhere to go. ## What changed One `QuerySourceBinding`: a backend `_tag` with that backend's parameters spread flat beside it, borrowed from the wire schema (#49069) so the binding and the persisted cell agree by construction. - **`QuerySource` is deleted.** `useRunSource` returns the shared binding, so `runSource.type`/`dateRange` become `_tag`/`time_range` across the SQL editor — that is most of the file count here. - **`getQuerySourceBinding`** projects a notebook cell onto a binding; **`toQuerySourceBinding`** does the same for any backend-tagged carrier. Both overloaded so an already-narrowed caller gets the matching binding back rather than the union, which keeps the result spreadable without re-narrowing. - **`ExplorerQuerySourceMenu`** drops its inline copy of the custom-range and upgrade-prompt logic in favor of `useLogsCustomRange`, which the SQL editor menu already used. The registry keeps only what is genuinely runtime: endpoints, labels, icons, availability, defaults. What a query *is* stays in the wire schema. ## Verification Typecheck, Prettier, and the lint ratchet clean. 405 tests pass across the notebook schema, query sources, the logs components, the SQL editor, and the Explorer surfaces. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Improvements** * Updated query source handling across Explorer and SQL Editor for a more consistent selection experience. * Database and log sources now preserve identifiers and time ranges more reliably when switching or editing queries. * Source menus, labels, icons, validation, and query execution now reflect the selected source more accurately. * **Bug Fixes** * Invalid or outdated saved source settings now safely fall back to a database source. * Improved log-source detection and time-range handling throughout query editing and execution. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
251 lines
8.5 KiB
TypeScript
251 lines
8.5 KiB
TypeScript
import { acceptUntrustedSql, untrustedSql } from '@supabase/pg-meta'
|
|
import { useFlag } from 'common'
|
|
import { CodeSquare, Eye, EyeOff, Play } from 'lucide-react'
|
|
import { useState, type ReactNode } from 'react'
|
|
import { cn } from 'ui'
|
|
|
|
import { resolveLogTimeRange } from '../QuerySources/LogTimeRange.utils'
|
|
import {
|
|
ExplorerQuery,
|
|
ExplorerQueryEditor,
|
|
ExplorerQueryFooter,
|
|
ExplorerQueryResults,
|
|
ExplorerQueryViewport,
|
|
} from './ExplorerQuery'
|
|
import { ExplorerQuerySourceMenu } from './ExplorerQuerySourceMenu'
|
|
import {
|
|
ExplorerToolbar,
|
|
ExplorerToolbarAction,
|
|
ExplorerToolbarActions,
|
|
ExplorerToolbarIcon,
|
|
ExplorerToolbarTitle,
|
|
} from './ExplorerToolbar'
|
|
import { DisplaySettingsButton } from './QueryCell/DisplaySettingsButton'
|
|
import { QueryResultChart } from './QueryCell/QueryResultChart'
|
|
import { QueryResultTable } from './QueryResultTable'
|
|
import { type QueryDisplay, type QueryResult } from './types'
|
|
import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
|
|
import { isValidConnString } from '@/data/fetchers'
|
|
import { useExecuteLogsSqlMutation } from '@/data/logs/execute-logs-sql-mutation'
|
|
import { acceptUntrustedLogsSql, untrustedLogSql } from '@/data/logs/safe-analytics-sql'
|
|
import {
|
|
createDefaultSourceBinding,
|
|
QUERY_SOURCE_REGISTRY,
|
|
type QuerySourceBinding,
|
|
} from '@/data/query-sources/query-source-registry'
|
|
import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
|
|
import { useExecuteSqlMutation } from '@/data/sql/execute-sql-mutation'
|
|
import { applyAutoLimit } from '@/data/sql/utils'
|
|
import { useLatest } from '@/hooks/misc/useLatest'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
|
|
export type QueryEditorProps = {
|
|
id: string
|
|
variant: 'embedded' | 'viewport'
|
|
title: string
|
|
sql: string
|
|
source?: QuerySourceBinding
|
|
result?: QueryResult
|
|
rowLimit?: number
|
|
display?: QueryDisplay
|
|
toolbarActions?: ReactNode
|
|
onTitleChange: (title: string) => void
|
|
onSqlChange: (sql: string) => void
|
|
onSqlCommit?: (sql: string) => void
|
|
onSourceChange?: (source: QuerySourceBinding) => void
|
|
onResultChange: (result: QueryResult) => void
|
|
onDisplayChange?: (display: QueryDisplay) => void
|
|
}
|
|
|
|
/**
|
|
* Shared query editor used by query tabs, notebook cells, and other Explorer surfaces.
|
|
* The consuming surface owns persistence and surrounding chrome; this component owns
|
|
* query-level UI and execution behavior.
|
|
*/
|
|
export const QueryEditor = ({
|
|
id,
|
|
variant,
|
|
title,
|
|
sql,
|
|
source,
|
|
result,
|
|
rowLimit,
|
|
display,
|
|
toolbarActions,
|
|
onTitleChange,
|
|
onSqlChange,
|
|
onSqlCommit,
|
|
onSourceChange,
|
|
onResultChange,
|
|
onDisplayChange,
|
|
}: QueryEditorProps) => {
|
|
const sqlRef = useLatest(sql)
|
|
const onSqlCommitRef = useLatest(onSqlCommit)
|
|
|
|
const isOtelLogsEnabled = useFlag('otelLegacyLogs')
|
|
const { data: project, isPending: isLoadingProject } = useSelectedProjectQuery()
|
|
|
|
const view = display?.view ?? 'table'
|
|
const columns = Object.keys(result?.rows?.[0] ?? {})
|
|
const sourceBinding = source ?? createDefaultSourceBinding('database')
|
|
|
|
const [showQuery, setShowQuery] = useState(true)
|
|
|
|
const databaseIdentifier =
|
|
sourceBinding._tag === 'database' ? sourceBinding.database_identifier : undefined
|
|
|
|
const { data: databases, isPending: isLoadingDatabases } = useReadReplicasQuery(
|
|
{ projectRef: project?.ref },
|
|
{
|
|
enabled:
|
|
databaseIdentifier !== undefined &&
|
|
project?.ref !== undefined &&
|
|
databaseIdentifier !== project.ref,
|
|
}
|
|
)
|
|
|
|
const { mutate: executeSql, isPending: isExecutingSql } = useExecuteSqlMutation({
|
|
onSuccess: (data) => onResultChange({ rows: data.result }),
|
|
onError: (error) => onResultChange({ error }),
|
|
})
|
|
|
|
const { mutate: executeLogsSql, isPending: isExecutingLogs } = useExecuteLogsSqlMutation({
|
|
onSuccess: (data) => onResultChange({ rows: data.rows as readonly Record<string, unknown>[] }),
|
|
onError: (error) => onResultChange({ error }),
|
|
})
|
|
|
|
const isResolvingDatabase =
|
|
databaseIdentifier !== undefined && databaseIdentifier !== project?.ref && isLoadingDatabases
|
|
const isExecuting = isExecutingSql || isExecutingLogs
|
|
const isBusy = isLoadingProject || isResolvingDatabase || isExecuting
|
|
|
|
const handleRunQuery = (sqlToRun: string = sql) => {
|
|
if (!project || isBusy || sqlToRun.trim().length === 0) return
|
|
|
|
onSqlCommit?.(sql)
|
|
|
|
if (sourceBinding._tag === 'logs') {
|
|
if (!isOtelLogsEnabled) {
|
|
onResultChange({
|
|
error: { message: "Querying logs isn't available for this project yet." },
|
|
})
|
|
return
|
|
}
|
|
|
|
executeLogsSql({
|
|
projectRef: project.ref,
|
|
sql: acceptUntrustedLogsSql(untrustedLogSql(sqlToRun)),
|
|
range: resolveLogTimeRange(sourceBinding.time_range),
|
|
endpoint: QUERY_SOURCE_REGISTRY.logs.endpoint,
|
|
})
|
|
return
|
|
}
|
|
|
|
const safeSql = acceptUntrustedSql(untrustedSql(sqlToRun))
|
|
const limitedSql = applyAutoLimit(safeSql, rowLimit)
|
|
const connectionString =
|
|
databaseIdentifier === undefined || databaseIdentifier === project.ref
|
|
? project.connectionString
|
|
: databases?.find((database) => database.identifier === databaseIdentifier)
|
|
?.connectionString
|
|
|
|
if (!isValidConnString(connectionString)) {
|
|
onResultChange({ error: { message: 'Unable to run query: Connection string is missing' } })
|
|
return
|
|
}
|
|
|
|
executeSql({
|
|
projectRef: project.ref,
|
|
connectionString,
|
|
sql: limitedSql.sql,
|
|
autoLimit: limitedSql.appendAutoLimit ? rowLimit : undefined,
|
|
contextualInvalidation: true,
|
|
isStatementTimeoutDisabled: true,
|
|
})
|
|
}
|
|
|
|
const Shell = variant === 'viewport' ? ExplorerQueryViewport : ExplorerQuery
|
|
|
|
return (
|
|
<Shell className={variant === 'embedded' ? 'mx-auto max-w-4xl' : undefined}>
|
|
<ExplorerToolbar>
|
|
<ExplorerToolbarIcon>
|
|
<CodeSquare size={14} />
|
|
</ExplorerToolbarIcon>
|
|
<ExplorerToolbarTitle onSaveTitle={onTitleChange}>{title}</ExplorerToolbarTitle>
|
|
<ExplorerToolbarActions>
|
|
{toolbarActions}
|
|
{source && onSourceChange && (
|
|
<ExplorerQuerySourceMenu source={source} onSourceChange={onSourceChange} />
|
|
)}
|
|
{display && onDisplayChange && (
|
|
<DisplaySettingsButton
|
|
result={result}
|
|
display={display}
|
|
columns={columns}
|
|
disabled={(result?.rows ?? []).length === 0}
|
|
onChange={onDisplayChange}
|
|
/>
|
|
)}
|
|
<ExplorerToolbarAction
|
|
icon={showQuery ? <EyeOff /> : <Eye />}
|
|
tooltip={showQuery ? 'Hide query' : 'Show query'}
|
|
onClick={() => setShowQuery((value) => !value)}
|
|
/>
|
|
<ExplorerToolbarAction
|
|
loading={isExecuting || isLoadingProject}
|
|
icon={<Play />}
|
|
tooltip="Run query"
|
|
disabled={isLoadingProject || isExecuting || sql.trim().length === 0}
|
|
onClick={() => handleRunQuery()}
|
|
>
|
|
Run
|
|
</ExplorerToolbarAction>
|
|
</ExplorerToolbarActions>
|
|
</ExplorerToolbar>
|
|
|
|
{showQuery && (
|
|
<ExplorerQueryEditor
|
|
className={cn('relative', variant === 'viewport' ? 'h-[45%] min-h-48' : undefined)}
|
|
>
|
|
<CodeEditor
|
|
id={`explorer-query-${id}`}
|
|
language="pgsql"
|
|
value={sql}
|
|
placeholder="select * from your_table limit 100;"
|
|
placeholderClassName="top-[13px]"
|
|
className={variant === 'embedded' ? 'h-32' : undefined}
|
|
actions={{ runQuery: { enabled: true, callback: handleRunQuery } }}
|
|
options={{ minimap: { enabled: false }, padding: { top: 8 } }}
|
|
onInputChange={(value) => onSqlChange(value ?? '')}
|
|
onMount={(editor) => {
|
|
editor.onDidBlurEditorWidget(() => onSqlCommitRef.current?.(sqlRef.current))
|
|
}}
|
|
/>
|
|
</ExplorerQueryEditor>
|
|
)}
|
|
|
|
<ExplorerQueryResults
|
|
className={cn(
|
|
(result?.rows ?? []).length === 0 && view === 'table'
|
|
? 'items-center justify-center'
|
|
: 'overflow-x-auto'
|
|
)}
|
|
>
|
|
{view === 'table' && <QueryResultTable result={result} />}
|
|
{view === 'chart' && <QueryResultChart chart={display?.chart} result={result} />}
|
|
</ExplorerQueryResults>
|
|
|
|
<ExplorerQueryFooter className="flex items-center gap-x-2">
|
|
<p>{(result?.rows ?? []).length.toLocaleString()} rows</p>
|
|
{rowLimit && (
|
|
<>
|
|
<p>·</p>
|
|
<p>Limit {rowLimit} rows</p>
|
|
</>
|
|
)}
|
|
</ExplorerQueryFooter>
|
|
</Shell>
|
|
)
|
|
}
|