mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 18:05:11 +03:00
App-level fixes that reproduce on BOTH the Next and TanStack builds — split out of #47657 (which stays TanStack-only) for reviewability. All were found by a full-site click-through of the dashboard. ## Invalid HTML nesting (React 19 "will cause a hydration error" console errors) - **FormLayout description rendered in a `<p>`** (`packages/ui-patterns`): consumers pass arbitrary JSX (the RowEditor's `created_at` timezone note passes a `<div>` with `<p>`s) → `<p>`-in-`<p>` / `<div>`-in-`<p>`. Container is now a `<div>` with identical classes (Tailwind preflight makes them render the same). - **Switch toggles nested inside Tooltip trigger buttons** (button-in-button) in ColumnEditor ("Allow Nullable" + "Is Unique"), ExtensionRow, and PublicationsTableItem → repo-standard `TooltipTrigger asChild` + `<div>` wrapper. - **Saved log queries rendered a `<div>` directly inside `<tbody>`** (`/logs/explorer/saved`) → rows are now proper `<tr><td colSpan>` wrappers; the component itself is untouched (it's valid in its sidebar usage). - **Nested anchors in observability metric cards**: a card-level `<Link>` wrapped MetricCard's "More information" `<Link>` (identical URLs) → the chevron affordance renders as a `<span>` when no `href` is passed; clicks bubble to the card link, tooltips preserved. Design-system standalone usage unaffected. - **`objectFit="cover"` passed to modern `next/image`** on the featured integration card (unknown-prop warning) — the className already had `object-cover`; prop dropped. ## Ghost dead-snippet after deletion Deleting the active SQL snippet left its id in `useDashboardHistory` (`history.sql`), so the "SQL Editor" nav item navigated to `/sql/<deleted-id>` — content fetch 404s, no editor pane renders, and a phantom tab reappears. Fixed both ends: delete flows now purge dashboard history (and the tabs store clears a stale `previewTabId`), and `/sql/[id]` treats a snippet 404 as "clean up + `router.replace` to `/sql/new` + toast" instead of rendering the dead state. Unit tests for the store/history cleanup. ## `pg-meta` migrations query 400s on every project load `ActivityStats` on project home runs the migrations list query, whose SQL was a bare `select * from supabase_migrations.schema_migrations` — that table only exists once a migration has run, so every other project logged a failed `?key=migrations` request on every load (visible in production consoles too). The SQL is now guarded with `to_regclass` + `query_to_xml` (same pattern as the advisor lints' `storage.buckets` guard), returning zero rows instead of erroring; legacy version-only tables still work. Tested against real dockerized Postgres (absent table, populated ordering, special chars, legacy schema) + MSW hook tests. Found and verified via /test-supabase-local (browser click-through + console audit on both builds). ## To test Console must stay free of React DOM-nesting errors ("cannot be a descendant of" / "cannot contain a nested") on each surface: 1. Table editor → Insert row panel (`created_at` field renders its timezone note) and Edit column panel ("Allow Nullable"/"Is Unique" tooltips still hover). 2. `/database/extensions` and `/database/publications` → toggle switches render, tooltips hover. 3. `/logs/explorer/saved` (with ≥1 saved query) → rows render full-width inside the table, hover shows Actions. 4. `/observability` → no nested-anchor error on load; card body click and the chevron both navigate; label help-icons still show tooltips. 5. `/integrations` → no `objectFit` unknown-prop warning; featured card images still cover. 6. **Ghost snippet**: open a SQL snippet → delete it via the sidebar → click the "SQL Editor" nav item → lands on `/sql/new` (no phantom tab, no 404 content fetch). Direct-load `/sql/<random-uuid>` → toast + redirect to `/sql/new`. 7. **Migrations 400**: load project home with a project that has never run a migration → the `pg-meta/<ref>/query?key=migrations` request returns **200** with `[]` (previously a 400 on every load). Database → Migrations still lists real migrations when they exist. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Summary by CodeRabbit * **Bug Fixes** * Deleted SQL snippets are fully removed from dashboard history and stale editor/tab state; users are redirected with a toast. * Closing preview tabs no longer leaves stale references. * Improved toggle/tooltip/dialog interactions to avoid broken UI, including metric headers showing tooltips even without direct links. * Migrations display safely when migration tables/relations are missing. * **UI Improvements** * Refreshed layout for saved queries, form descriptions, and integration imagery. * **Tests** * Added coverage for snippet history cleanup, tab removal, migrations SQL behavior, and query edge cases. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --- ### Review feedback: `query_to_xml` breaks on Multigres (Ivan) The defensive migrations query (added here to stop the `?key=migrations` 400 when the table doesn't exist yet) originally guarded with `query_to_xml`, which is forbidden through Multigres's pooler (MUL-736 / PSQL-1318). Rewritten without `query_to_xml`/`xmltable` using the splinter#170 pattern: a PL/pgSQL `do` block guarded by `to_regclass` (PL/pgSQL defers planning, so a missing table never errors) stashes the rows into a transaction-local GUC via `set_config`, and a trailing `select` reads them back with `jsonb_array_elements`. Verified that postgres-meta sends the whole SQL as one simple-query string → single implicit transaction → the local GUC survives to the `select` and doesn't leak into the pooled connection. 6/6 dockerized-Postgres tests (absent table → `[]`, populated/ordered/special-chars, legacy version-only table, full pg-meta-shaped multi-statement string, GUC non-leakage). Note (out of scope, pre-existing): `packages/pg-meta/src/sql/studio/advisor/lints.ts` still uses `query_to_xml` — a separate pre-existing Multigres risk that should get its own splinter-pattern sync. --------- Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com> Co-authored-by: Joshen Lim <joshenlimek@gmail.com> Co-authored-by: Saxon Fletcher <saxonafletcher@gmail.com>
162 lines
6.1 KiB
TypeScript
162 lines
6.1 KiB
TypeScript
import { randomUUID } from 'crypto'
|
|
import pg, { Pool, type QueryResult } from 'pg'
|
|
import { parse as parseArray } from 'postgres-array'
|
|
|
|
// Those types override are in sync with `postgres-meta` since the queries
|
|
// will get executed via `execQuery` on a pg connection with the same configuration
|
|
// see: https://github.com/supabase/postgres-meta/blob/ca06061b4708971628134f95e49f254c2dfdfa7d/src/lib/db.ts#L6-L23
|
|
pg.types.setTypeParser(pg.types.builtins.INT8, (x) => {
|
|
const asNumber = Number(x)
|
|
if (Number.isSafeInteger(asNumber)) {
|
|
return asNumber
|
|
} else {
|
|
return x
|
|
}
|
|
})
|
|
pg.types.setTypeParser(pg.types.builtins.DATE, (x) => x)
|
|
pg.types.setTypeParser(pg.types.builtins.INTERVAL, (x) => x)
|
|
pg.types.setTypeParser(pg.types.builtins.TIMESTAMP, (x) => x)
|
|
pg.types.setTypeParser(pg.types.builtins.TIMESTAMPTZ, (x) => x)
|
|
pg.types.setTypeParser(1115, parseArray) // _timestamp
|
|
pg.types.setTypeParser(1182, parseArray) // _date
|
|
pg.types.setTypeParser(1185, parseArray) // _timestamptz
|
|
pg.types.setTypeParser(600, (x) => x) // point
|
|
pg.types.setTypeParser(1017, (x) => x) // _point
|
|
|
|
const ROOT_DB_URL = process.env.DATABASE_URL ?? 'postgresql://postgres:postgres@localhost:5432'
|
|
const ROOT_DB_NAME = process.env.DATABASE_NAME ?? 'postgres'
|
|
|
|
// Replace postgres.js root connection with pg connection
|
|
const rootPool = new Pool({
|
|
connectionString: `${ROOT_DB_URL}/${ROOT_DB_NAME}`,
|
|
max: 1,
|
|
})
|
|
|
|
export async function createTestDatabase() {
|
|
const dbName = `test_${randomUUID().replace(/-/g, '_')}`
|
|
|
|
try {
|
|
await rootPool.query(`CREATE DATABASE ${dbName};`)
|
|
|
|
const pool = new Pool({
|
|
connectionString: `${ROOT_DB_URL}/${dbName}`,
|
|
max: 1,
|
|
idleTimeoutMillis: 20000,
|
|
connectionTimeoutMillis: 10000,
|
|
})
|
|
|
|
return {
|
|
dbName,
|
|
client: 'pg' as const,
|
|
executeQuery: async <T = any>(query: string): Promise<T> => {
|
|
try {
|
|
const res: QueryResult | QueryResult[] = await pool.query(query)
|
|
// node-pg resolves multi-statement queries with one result per
|
|
// statement. Mirror `postgres-meta`, which returns the rows of the
|
|
// last statement that produced any:
|
|
// https://github.com/supabase/postgres-meta/blob/master/src/lib/db.ts
|
|
const rows = Array.isArray(res)
|
|
? (res.reverse().find((x) => x.rows.length !== 0)?.rows ?? [])
|
|
: res.rows
|
|
return rows as T
|
|
} catch (error) {
|
|
if (error instanceof Error) {
|
|
throw new Error(`Failed to execute query: ${error.message}`)
|
|
}
|
|
throw error
|
|
}
|
|
},
|
|
cleanup: async () => {
|
|
await pool.end()
|
|
await rootPool.query(`DROP DATABASE ${dbName};`)
|
|
},
|
|
}
|
|
} catch (error) {
|
|
if (error instanceof Error) {
|
|
throw new Error(`Failed to create test database: ${error.message}`)
|
|
}
|
|
throw error
|
|
}
|
|
}
|
|
|
|
// Update cleanup function to use pg pool
|
|
export async function cleanupRoot() {
|
|
await rootPool.end()
|
|
}
|
|
|
|
export async function createDatabaseWithAuthSchema(
|
|
db: Awaited<ReturnType<typeof createTestDatabase>>,
|
|
options?: { includeIdentities?: boolean }
|
|
) {
|
|
const { includeIdentities = false } = options || {}
|
|
|
|
await db.executeQuery(`
|
|
CREATE SCHEMA IF NOT EXISTS auth;
|
|
|
|
CREATE TABLE IF NOT EXISTS auth.users (
|
|
instance_id uuid NULL,
|
|
id uuid NOT NULL UNIQUE,
|
|
aud varchar(255) NULL,
|
|
"role" varchar(255) NULL,
|
|
email varchar(255) NULL,
|
|
encrypted_password varchar(255) NULL,
|
|
email_confirmed_at timestamptz NULL,
|
|
invited_at timestamptz NULL,
|
|
confirmation_token varchar(255) NULL,
|
|
confirmation_sent_at timestamptz NULL,
|
|
recovery_token varchar(255) NULL,
|
|
recovery_sent_at timestamptz NULL,
|
|
email_change_token varchar(255) NULL,
|
|
email_change varchar(255) NULL,
|
|
email_change_sent_at timestamptz NULL,
|
|
last_sign_in_at timestamptz NULL,
|
|
raw_app_meta_data jsonb NULL,
|
|
raw_user_meta_data jsonb NULL,
|
|
is_super_admin bool NULL,
|
|
created_at timestamptz NULL,
|
|
updated_at timestamptz NULL,
|
|
phone text NULL,
|
|
phone_confirmed_at timestamptz NULL,
|
|
phone_change text NULL,
|
|
phone_change_token varchar(255) NULL,
|
|
phone_change_sent_at timestamptz NULL,
|
|
confirmed_at timestamptz NULL,
|
|
email_change_token_current varchar(255) NULL,
|
|
email_change_confirm_status smallint NULL,
|
|
banned_until timestamptz NULL,
|
|
reauthentication_token varchar(255) NULL,
|
|
reauthentication_sent_at timestamptz NULL,
|
|
is_sso_user bool NOT NULL DEFAULT false,
|
|
deleted_at timestamptz NULL,
|
|
is_anonymous bool NOT NULL DEFAULT false,
|
|
CONSTRAINT users_pkey PRIMARY KEY (id)
|
|
);
|
|
|
|
CREATE INDEX IF NOT EXISTS users_instance_id_idx ON auth.users USING btree (instance_id);
|
|
CREATE INDEX IF NOT EXISTS users_instance_id_email_idx ON auth.users USING btree (instance_id, lower(email));
|
|
CREATE INDEX IF NOT EXISTS confirmation_token_idx ON auth.users USING btree (confirmation_token) WHERE confirmation_token IS NOT NULL;
|
|
CREATE INDEX IF NOT EXISTS recovery_token_idx ON auth.users USING btree (recovery_token) WHERE recovery_token IS NOT NULL;
|
|
CREATE INDEX IF NOT EXISTS email_change_token_current_idx ON auth.users USING btree (email_change_token_current) WHERE email_change_token_current IS NOT NULL;
|
|
CREATE INDEX IF NOT EXISTS email_change_token_new_idx ON auth.users USING btree (email_change_token) WHERE email_change_token IS NOT NULL;
|
|
CREATE INDEX IF NOT EXISTS reauthentication_token_idx ON auth.users USING btree (reauthentication_token) WHERE reauthentication_token IS NOT NULL;
|
|
CREATE INDEX IF NOT EXISTS users_is_anonymous_idx ON auth.users USING btree (is_anonymous);
|
|
`)
|
|
|
|
if (includeIdentities) {
|
|
await db.executeQuery(`
|
|
CREATE TABLE IF NOT EXISTS auth.identities (
|
|
id text NOT NULL,
|
|
user_id uuid NOT NULL,
|
|
identity_data jsonb NOT NULL,
|
|
provider text NOT NULL,
|
|
last_sign_in_at timestamptz NULL,
|
|
created_at timestamptz NULL,
|
|
updated_at timestamptz NULL,
|
|
CONSTRAINT identities_pkey PRIMARY KEY (provider, id)
|
|
);
|
|
|
|
CREATE INDEX IF NOT EXISTS identities_user_id_idx ON auth.identities USING btree (user_id);
|
|
`)
|
|
}
|
|
}
|