Files
supabase/apps/studio/components/interfaces/SQLEditor
Joshen Lim 71d58cba7f Joshenlim/fe 4401 re sql editor silently points to the primary instead of (#50513)
## Context

Fixes the following 2 issues with the database selection in the SQL
Editor
- An errant `useEffect` was resetting the `selectedDatabaseId` back to
the primary every time the `databases` list from `useReadReplicasQuery`
changed reference (not just on first load).
- `QuerySourceMenu` kept showing "Read Replica" even after selection had
reverted
- Was using local storage value as the `identifier` for
`DatabaseParametersSubMenu`, when it should use the valtio store as the
source of truth

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Improvements**
- The SQL Editor now remembers the last selected database between
sessions.
- Your saved database selection is restored when available; otherwise,
the project’s primary database is selected automatically.
- Query source settings now stay synchronized with the database
currently selected in the SQL Editor.

- **Bug Fixes**
- Background database refreshes no longer unexpectedly reset your
selected read replica to the primary database.
- Database selection now waits for saved preferences to load, preventing
a brief incorrect selection.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2026-09-17 12:34:13 +00:00
..
2026-03-17 11:17:42 +01:00

SQL Editor Overview

Quick run-through of the different building blocks that make up the SQL Editor, to help navigating the codebase a little easier 🙂🙏

UI structure

  • Folders and snippets (in the product menu) are rendered via SQLEditorMenu and SQLEditorNav, in which the data are all loaded from the API via React Query directly. (Refer to point 3 under "Data Structure" below)

    • SQLEditorMenu: Wraps around SQLEditorNav + renders search input + View running queries button
    • SQLEditorNav: Renders the 3 collapsible snippet sections
  • The Tabs interface is powered by a separate state tabs.ts. (Also used by the Table Editor)

  • Route validation to check for snippet validity + last visited snippet lies in the page level on [id].tsx

  • When searching for snippets, we're deliberately opting to render the results as a flat list in SearchList for ease of finding (rather than keeping the 3 separate sections / having folders)

Data structure

  • SQL Editor is mainly powered by a Valtio store in sql-editor-v2.ts, in which most of the data is being managed on the client side for optimistic rendering to keep the editor feeling snappy. (unlike other parts of the dashboard where the data is always invalidated whenever a mutation happens).

  • The Valtio store here stores snippets across multiple projects as we aren't using a context provider, though this was a legacy decision (refer to ProjectContext for more context on using providers with stores)

  • While SQLEditorNav renders the folders + snippets directly from the API endpoints via React Query, we still store them in the Valtio store to store some properties used on the client side like splitSizes and projectRef for snippets, and status for folders (although it's possible that we can simplify the Valtio store).

Data fetching

  • The endpoint to fetch snippets and folders are via useSQLSnippetFoldersQuery and useSqlSnippetsQuery, both of which are paginated (limit set at 100)

  • Page fetching is done on demand for the snippets via a "Load more" button due to the complexity of a tree view (we've deliberate avoided an infinite loading UX which we commonly do across other parts of the dashboard)

Data flow

Landing on the SQL Editor

  • Snippets and folders are all initially loaded via React Query in SQLEditorNav, which are then initialized into the Valtio store via snapV2.addSnippet calls in the useEffects

  • On /editor/sql

    • We'll redirect users to the last visited snippet if there's one (/editor/sql/[id]), otherwise will redirect to /editor/sql/new (within [id].tsx )
  • On /editor/sql/[id]

    • We'll load the content of the snippet via useContentQuery and update the Valtio store via snapV2.setSnippet

Writing a snippet

  • On /editor/sql/new:

    • The first character input will update the Valtio store with a snippet skeleton via snapV2.addSnippet and user will be redirected to /editor/sql/[id], using the id from the skeleton
    • Note that snapV2.addSnippet only handles adding snippets to the store and does not queue the snippet for saving
    • Subsequent character inputs will follow below as per /editor/sql/[id]
  • On /editor/sql/[id]:

    • snapV2.setSql will be called based on the debounced value of the code editor, in which we'll then queue the snippet for saving via upsertSnippet.
    • Note that we do invalidate some React Queries (snippet count, snippets, and folders) after saving via upsertSnippet, but the invalidation is only triggered if it's a new snippet that's not saved in the DB yet

Running a snippet

Renaming, Moving, Deleting, Sharing snippets

  • These functionalities all call upsertContent via React Query directly without going through the Valtio store
  • We thereafter update the Valtio stores for the SQL Editor and Tabs as required if the upsert is successful

Possible areas to simplify, refactor, or improve

  • updateSnippet and setSql could be consolidated in sql-editor-v2.ts

  • Refactor renaming a query to have optimistic rendering for consistency on how we update snippets in the sql-editor-v2.ts

  • Implement drag and drop functionality for snippets into folders

  • RenameQueryModal and MoveQueryModal, could call updateSnippet instead of removeSnippet + addSnippet?