## What kind of change does this PR introduce? Bug fix ## What is the current behavior? When you open the SQL editor with prefilled SQL via `/sql/new?content=<sql>`, the editor seeds its contents from the `content` query param, then navigates to the newly created snippet with `router.push`. That leaves the (often very long) `/sql/new?content=...` URL in the browser history. Pressing Back returns to that URL instead of the page you came from. It is a wasted step, and it re-seeds and recreates a fresh snippet. This affects every entry point that opens the SQL editor with prefilled SQL, such as the table definition "Open in SQL Editor" button, create index, and the SQL command menu. ## What is the new behavior? When the editor is seeded from a `content` deep link, the navigation to the new snippet uses `router.replace` instead of `router.push`. This collapses the one-shot `/sql/new?content=...` URL out of the history. Back now returns straight to the page you came from, with no wasted step and no duplicate snippet. Normal new query creation (no `content` param) is unchanged. ## To test 1. Open any table in the Table Editor, switch to the Definition view, and click "Open in SQL Editor". Any deep link with prefilled SQL works. You can also visit `/project/<ref>/sql/new?content=SELECT%201` directly. 2. Confirm the SQL editor opens with the SQL prefilled, and the URL no longer contains `?content=`. 3. Press the browser Back button. 4. You return straight to the previous page in a single Back. Before this fix, the first Back landed on `/sql/new?content=...` and recreated a snippet, and only a second Back reached the page you came from. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved navigation behavior in SQL Editor when creating snippets from imported content, resulting in more efficient routing. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
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
SQLEditorMenuandSQLEditorNav, in which the data are all loaded from the API via React Query directly. (Refer to point 3 under "Data Structure" below)SQLEditorMenu: Wraps aroundSQLEditorNav+ renders search input + View running queries buttonSQLEditorNav: 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
SearchListfor 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
ProjectContextfor more context on using providers with stores) -
While
SQLEditorNavrenders 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 likesplitSizesandprojectReffor snippets, andstatusfor folders (although it's possible that we can simplify the Valtio store).
Data fetching
-
The endpoint to fetch snippets and folders are via
useSQLSnippetFoldersQueryanduseSqlSnippetsQuery, both of which are paginated (limit set at 100)useSQLSnippetFoldersQuery: Specifically for fetching private snippets and foldersuseSqlSnippetsQuery: For fetching shared and favorite snippets
-
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 viasnapV2.addSnippetcalls in theuseEffects -
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)
- We'll redirect users to the last visited snippet if there's one (
-
On
/editor/sql/[id]- We'll load the content of the snippet via
useContentQueryand update the Valtio store viasnapV2.setSnippet
- We'll load the content of the snippet via
Writing a snippet
-
On
/editor/sql/new:- The first character input will update the Valtio store with a snippet skeleton via
snapV2.addSnippetand user will be redirected to/editor/sql/[id], using theidfrom the skeleton - Note that
snapV2.addSnippetonly 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]
- The first character input will update the Valtio store with a snippet skeleton via
-
On
/editor/sql/[id]:snapV2.setSqlwill be called based on the debounced value of the code editor, in which we'll then queue the snippet for saving viaupsertSnippet.- 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
-
There's several safeguards in place before we run the query
- Check for destructive operations: Will open a confirmation modal before running the query
- Check for update statements without where clause: Will open a confirmation modal before running the query
- Append a preset limit to the query if it's a select: To prevent accidentally running an expensive query on the database. Users can explicitly opt out of this to set "No limit"
-
If the snippet's name is "Untitled query", we'll also trigger a non-blocking request to rename the snippet via AI. Snippet name will be updated whenever the request completes.
Renaming, Moving, Deleting, Sharing snippets
- These functionalities all call
upsertContentvia 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
-
updateSnippetandsetSqlcould be consolidated insql-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
-
RenameQueryModalandMoveQueryModal, could callupdateSnippetinstead ofremoveSnippet+addSnippet?