mirror of
https://github.com/supabase/supabase.git
synced 2026-09-06 09:59:03 +08: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>
110 lines
3.7 KiB
TypeScript
110 lines
3.7 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
|
|
import {
|
|
createDefaultSourceBinding,
|
|
getQuerySource,
|
|
getQuerySourceBinding,
|
|
QUERY_SOURCES,
|
|
querySourceBindingSchema,
|
|
toQuerySourceBinding,
|
|
} from './query-source-registry'
|
|
import { timeRangeSchema } from '@/data/content/notebooks/notebook-schema'
|
|
|
|
describe('query source registry', () => {
|
|
it('registers database and logs sources with their execution endpoints', () => {
|
|
expect(QUERY_SOURCES.map(({ _tag }) => _tag)).toEqual(['database', 'logs'])
|
|
expect(getQuerySource('database').endpoint).toBe('/platform/pg-meta/{ref}/query')
|
|
expect(getQuerySource('logs').endpoint).toBe(
|
|
'/platform/projects/{ref}/analytics/endpoints/logs.all.otel'
|
|
)
|
|
})
|
|
|
|
it('creates independent, valid default bindings', () => {
|
|
const first = createDefaultSourceBinding('logs')
|
|
const second = createDefaultSourceBinding('logs')
|
|
|
|
expect(querySourceBindingSchema.parse(first)).toEqual({
|
|
_tag: 'logs',
|
|
time_range: { _tag: 'relative_time_range', amount: 1, unit: 'hour' },
|
|
})
|
|
expect(first.time_range).not.toBe(second.time_range)
|
|
expect(querySourceBindingSchema.parse(createDefaultSourceBinding('database'))).toEqual({
|
|
_tag: 'database',
|
|
})
|
|
})
|
|
|
|
it('rejects parameters that do not match the selected source', () => {
|
|
expect(() =>
|
|
querySourceBindingSchema.parse({ _tag: 'logs', database_identifier: 'replica-1' })
|
|
).toThrow()
|
|
|
|
expect(() =>
|
|
querySourceBindingSchema.parse({
|
|
_tag: 'database',
|
|
time_range: { _tag: 'relative_time_range', amount: 1, unit: 'hour' },
|
|
})
|
|
).toThrow()
|
|
|
|
expect(() =>
|
|
querySourceBindingSchema.parse({
|
|
_tag: 'logs',
|
|
time_range: { _tag: 'relative_time_range', amount: 2, unit: 'fortnight' },
|
|
})
|
|
).toThrow()
|
|
})
|
|
})
|
|
|
|
describe('getQuerySourceBinding', () => {
|
|
it('projects a database cell onto its binding', () => {
|
|
expect(
|
|
getQuerySourceBinding({ _tag: 'database_cell', database_identifier: 'replica-1' })
|
|
).toEqual({ _tag: 'database', database_identifier: 'replica-1' })
|
|
})
|
|
|
|
it('projects a log cell onto its binding', () => {
|
|
expect(
|
|
getQuerySourceBinding({
|
|
_tag: 'log_cell',
|
|
time_range: { _tag: 'relative_time_range', unit: 'day', amount: 3 },
|
|
})
|
|
).toEqual({ _tag: 'logs', time_range: { _tag: 'relative_time_range', unit: 'day', amount: 3 } })
|
|
})
|
|
|
|
it('copies the time range rather than aliasing the cell it came from', () => {
|
|
const time_range = { _tag: 'relative_time_range', unit: 'hour', amount: 6 } as const
|
|
const binding = getQuerySourceBinding({ _tag: 'log_cell', time_range })
|
|
|
|
expect(binding).toEqual({ _tag: 'logs', time_range })
|
|
if (binding._tag !== 'logs') throw new Error('expected a logs binding')
|
|
expect(binding.time_range).not.toBe(time_range)
|
|
})
|
|
|
|
it('accepts the coarser relative units the wire schema allows', () => {
|
|
expect(
|
|
getQuerySourceBinding({
|
|
_tag: 'log_cell',
|
|
time_range: { _tag: 'relative_time_range', unit: 'month', amount: 2 },
|
|
})
|
|
).toEqual({
|
|
_tag: 'logs',
|
|
time_range: { _tag: 'relative_time_range', unit: 'month', amount: 2 },
|
|
})
|
|
})
|
|
})
|
|
|
|
describe('toQuerySourceBinding', () => {
|
|
it('projects a backend-tagged carrier such as a query draft', () => {
|
|
expect(toQuerySourceBinding({ _tag: 'database', database_identifier: 'replica-1' })).toEqual({
|
|
_tag: 'database',
|
|
database_identifier: 'replica-1',
|
|
})
|
|
|
|
const time_range = timeRangeSchema.parse({
|
|
_tag: 'absolute_time_range',
|
|
start: '2025-01-01T00:00:00.000Z',
|
|
end: '2025-01-02T00:00:00.000Z',
|
|
})
|
|
expect(toQuerySourceBinding({ _tag: 'logs', time_range })).toEqual({ _tag: 'logs', time_range })
|
|
})
|
|
})
|