Add SQL query formatter/prettifier (Ctrl+Shift+F) by muk2 · Pull Request #41 · muk2/pgrsql

muk2 · 2026-02-19T22:36:38Z

Summary

Implements #33 — adds a built-in SQL query formatter that auto-formats messy or one-line SQL into well-indented, readable SQL directly in the editor.

New ast::formatter module with format_sql() function that pretty-prints Query AST nodes
Shortcut: Ctrl+Shift+F in the editor formats the entire buffer
Multi-line formatting: Each major SQL clause on its own line (SELECT, FROM, WHERE, JOIN, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET)
Indented projections: Multi-column SELECT lists get one column per line with proper indentation
JOIN formatting: JOIN conditions indented under their JOIN clause
All query types: SELECT, INSERT, UPDATE, DELETE, CTEs, UNION/INTERSECT/EXCEPT
Non-destructive: Shows toast error if SQL can't be parsed; buffer unchanged
Single undo step: Ctrl+Z reverts the entire format operation
16 new unit tests including round-trip reparse verification ensuring formatted SQL is always valid

Example

Before (single line):

SELECTu.id, u.name, o.totalFROM users u JOIN orders o ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

After (Ctrl+Shift+F):

SELECTu.id,
u.name,
o.totalFROM users AS u
JOIN orders AS o
ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

Test plan

cargo build compiles without warnings
cargo test — all 232 tests pass (16 new formatter tests)
Formatter produces valid SQL (round-trip reparse test)
Multi-column SELECT indentation
JOIN/WHERE/GROUP BY/ORDER BY each on own line
CTE formatting
INSERT/UPDATE/DELETE formatting
Help overlay shows new shortcut

Closes#33

🤖 Generated with Claude Code

Adds a built-in SQL pretty-printer that formats messy queries into well-indented, readable SQL using the existing AST parse→compile pipeline. Triggered via Ctrl+Shift+F in the editor. - New `ast::formatter` module with `format_sql()` function - Multi-line output: each SQL clause (SELECT, FROM, WHERE, JOIN, GROUP BY, ORDER BY, LIMIT, OFFSET) on its own line - Indented column lists for multi-column SELECT - JOIN conditions indented under their JOIN clause - Supports all query types: SELECT, INSERT, UPDATE, DELETE, CTEs - Non-destructive: shows toast error on parse failure - Single undo step to revert formatting - 16 unit tests including round-trip reparse verification - Help overlay updated with new shortcut Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflicts in app.rs and components.rs by keeping both the SQL formatter feature and autocomplete additions from main. Run cargo fmt for consistent formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

muk2 · 2026-02-19T22:36:38Z

Summary

Implements #33 — adds a built-in SQL query formatter that auto-formats messy or one-line SQL into well-indented, readable SQL directly in the editor.

New ast::formatter module with format_sql() function that pretty-prints Query AST nodes
Shortcut: Ctrl+Shift+F in the editor formats the entire buffer
Multi-line formatting: Each major SQL clause on its own line (SELECT, FROM, WHERE, JOIN, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET)
Indented projections: Multi-column SELECT lists get one column per line with proper indentation
JOIN formatting: JOIN conditions indented under their JOIN clause
All query types: SELECT, INSERT, UPDATE, DELETE, CTEs, UNION/INTERSECT/EXCEPT
Non-destructive: Shows toast error if SQL can't be parsed; buffer unchanged
Single undo step: Ctrl+Z reverts the entire format operation
16 new unit tests including round-trip reparse verification ensuring formatted SQL is always valid

Example

Before (single line):

SELECTu.id, u.name, o.totalFROM users u JOIN orders o ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

After (Ctrl+Shift+F):

SELECTu.id,
u.name,
o.totalFROM users AS u
JOIN orders AS o
ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

Test plan

cargo build compiles without warnings
cargo test — all 232 tests pass (16 new formatter tests)
Formatter produces valid SQL (round-trip reparse test)
Multi-column SELECT indentation
JOIN/WHERE/GROUP BY/ORDER BY each on own line
CTE formatting
INSERT/UPDATE/DELETE formatting
Help overlay shows new shortcut

Closes#33

🤖 Generated with Claude Code

Adds a built-in SQL pretty-printer that formats messy queries into well-indented, readable SQL using the existing AST parse→compile pipeline. Triggered via Ctrl+Shift+F in the editor. - New `ast::formatter` module with `format_sql()` function - Multi-line output: each SQL clause (SELECT, FROM, WHERE, JOIN, GROUP BY, ORDER BY, LIMIT, OFFSET) on its own line - Indented column lists for multi-column SELECT - JOIN conditions indented under their JOIN clause - Supports all query types: SELECT, INSERT, UPDATE, DELETE, CTEs - Non-destructive: shows toast error on parse failure - Single undo step to revert formatting - 16 unit tests including round-trip reparse verification - Help overlay updated with new shortcut Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflicts in app.rs and components.rs by keeping both the SQL formatter feature and autocomplete additions from main. Run cargo fmt for consistent formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

muk2 · 2026-02-19T22:36:38Z

Summary

Implements #33 — adds a built-in SQL query formatter that auto-formats messy or one-line SQL into well-indented, readable SQL directly in the editor.

New ast::formatter module with format_sql() function that pretty-prints Query AST nodes
Shortcut: Ctrl+Shift+F in the editor formats the entire buffer
Multi-line formatting: Each major SQL clause on its own line (SELECT, FROM, WHERE, JOIN, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET)
Indented projections: Multi-column SELECT lists get one column per line with proper indentation
JOIN formatting: JOIN conditions indented under their JOIN clause
All query types: SELECT, INSERT, UPDATE, DELETE, CTEs, UNION/INTERSECT/EXCEPT
Non-destructive: Shows toast error if SQL can't be parsed; buffer unchanged
Single undo step: Ctrl+Z reverts the entire format operation
16 new unit tests including round-trip reparse verification ensuring formatted SQL is always valid

Example

Before (single line):

SELECTu.id, u.name, o.totalFROM users u JOIN orders o ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

After (Ctrl+Shift+F):

SELECTu.id,
u.name,
o.totalFROM users AS u
JOIN orders AS o
ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

Test plan

cargo build compiles without warnings
cargo test — all 232 tests pass (16 new formatter tests)
Formatter produces valid SQL (round-trip reparse test)
Multi-column SELECT indentation
JOIN/WHERE/GROUP BY/ORDER BY each on own line
CTE formatting
INSERT/UPDATE/DELETE formatting
Help overlay shows new shortcut

Closes#33

🤖 Generated with Claude Code

Adds a built-in SQL pretty-printer that formats messy queries into well-indented, readable SQL using the existing AST parse→compile pipeline. Triggered via Ctrl+Shift+F in the editor. - New `ast::formatter` module with `format_sql()` function - Multi-line output: each SQL clause (SELECT, FROM, WHERE, JOIN, GROUP BY, ORDER BY, LIMIT, OFFSET) on its own line - Indented column lists for multi-column SELECT - JOIN conditions indented under their JOIN clause - Supports all query types: SELECT, INSERT, UPDATE, DELETE, CTEs - Non-destructive: shows toast error on parse failure - Single undo step to revert formatting - 16 unit tests including round-trip reparse verification - Help overlay updated with new shortcut Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflicts in app.rs and components.rs by keeping both the SQL formatter feature and autocomplete additions from main. Run cargo fmt for consistent formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

muk2 · 2026-02-19T22:36:38Z

Summary

Implements #33 — adds a built-in SQL query formatter that auto-formats messy or one-line SQL into well-indented, readable SQL directly in the editor.

New ast::formatter module with format_sql() function that pretty-prints Query AST nodes
Shortcut: Ctrl+Shift+F in the editor formats the entire buffer
Multi-line formatting: Each major SQL clause on its own line (SELECT, FROM, WHERE, JOIN, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET)
Indented projections: Multi-column SELECT lists get one column per line with proper indentation
JOIN formatting: JOIN conditions indented under their JOIN clause
All query types: SELECT, INSERT, UPDATE, DELETE, CTEs, UNION/INTERSECT/EXCEPT
Non-destructive: Shows toast error if SQL can't be parsed; buffer unchanged
Single undo step: Ctrl+Z reverts the entire format operation
16 new unit tests including round-trip reparse verification ensuring formatted SQL is always valid

Example

Before (single line):

SELECTu.id, u.name, o.totalFROM users u JOIN orders o ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

After (Ctrl+Shift+F):

SELECTu.id,
u.name,
o.totalFROM users AS u
JOIN orders AS o
ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

Test plan

cargo build compiles without warnings
cargo test — all 232 tests pass (16 new formatter tests)
Formatter produces valid SQL (round-trip reparse test)
Multi-column SELECT indentation
JOIN/WHERE/GROUP BY/ORDER BY each on own line
CTE formatting
INSERT/UPDATE/DELETE formatting
Help overlay shows new shortcut

Closes#33

🤖 Generated with Claude Code

Adds a built-in SQL pretty-printer that formats messy queries into well-indented, readable SQL using the existing AST parse→compile pipeline. Triggered via Ctrl+Shift+F in the editor. - New `ast::formatter` module with `format_sql()` function - Multi-line output: each SQL clause (SELECT, FROM, WHERE, JOIN, GROUP BY, ORDER BY, LIMIT, OFFSET) on its own line - Indented column lists for multi-column SELECT - JOIN conditions indented under their JOIN clause - Supports all query types: SELECT, INSERT, UPDATE, DELETE, CTEs - Non-destructive: shows toast error on parse failure - Single undo step to revert formatting - 16 unit tests including round-trip reparse verification - Help overlay updated with new shortcut Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflicts in app.rs and components.rs by keeping both the SQL formatter feature and autocomplete additions from main. Run cargo fmt for consistent formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

muk2 · 2026-02-19T22:36:38Z

Summary

Implements #33 — adds a built-in SQL query formatter that auto-formats messy or one-line SQL into well-indented, readable SQL directly in the editor.

New ast::formatter module with format_sql() function that pretty-prints Query AST nodes
Shortcut: Ctrl+Shift+F in the editor formats the entire buffer
Multi-line formatting: Each major SQL clause on its own line (SELECT, FROM, WHERE, JOIN, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET)
Indented projections: Multi-column SELECT lists get one column per line with proper indentation
JOIN formatting: JOIN conditions indented under their JOIN clause
All query types: SELECT, INSERT, UPDATE, DELETE, CTEs, UNION/INTERSECT/EXCEPT
Non-destructive: Shows toast error if SQL can't be parsed; buffer unchanged
Single undo step: Ctrl+Z reverts the entire format operation
16 new unit tests including round-trip reparse verification ensuring formatted SQL is always valid

Example

Before (single line):

SELECTu.id, u.name, o.totalFROM users u JOIN orders o ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

After (Ctrl+Shift+F):

SELECTu.id,
u.name,
o.totalFROM users AS u
JOIN orders AS o
ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

Test plan

cargo build compiles without warnings
cargo test — all 232 tests pass (16 new formatter tests)
Formatter produces valid SQL (round-trip reparse test)
Multi-column SELECT indentation
JOIN/WHERE/GROUP BY/ORDER BY each on own line
CTE formatting
INSERT/UPDATE/DELETE formatting
Help overlay shows new shortcut

Closes#33

🤖 Generated with Claude Code

Adds a built-in SQL pretty-printer that formats messy queries into well-indented, readable SQL using the existing AST parse→compile pipeline. Triggered via Ctrl+Shift+F in the editor. - New `ast::formatter` module with `format_sql()` function - Multi-line output: each SQL clause (SELECT, FROM, WHERE, JOIN, GROUP BY, ORDER BY, LIMIT, OFFSET) on its own line - Indented column lists for multi-column SELECT - JOIN conditions indented under their JOIN clause - Supports all query types: SELECT, INSERT, UPDATE, DELETE, CTEs - Non-destructive: shows toast error on parse failure - Single undo step to revert formatting - 16 unit tests including round-trip reparse verification - Help overlay updated with new shortcut Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflicts in app.rs and components.rs by keeping both the SQL formatter feature and autocomplete additions from main. Run cargo fmt for consistent formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

muk2 · 2026-02-19T22:36:38Z

Summary

Implements #33 — adds a built-in SQL query formatter that auto-formats messy or one-line SQL into well-indented, readable SQL directly in the editor.

New ast::formatter module with format_sql() function that pretty-prints Query AST nodes
Shortcut: Ctrl+Shift+F in the editor formats the entire buffer
Multi-line formatting: Each major SQL clause on its own line (SELECT, FROM, WHERE, JOIN, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET)
Indented projections: Multi-column SELECT lists get one column per line with proper indentation
JOIN formatting: JOIN conditions indented under their JOIN clause
All query types: SELECT, INSERT, UPDATE, DELETE, CTEs, UNION/INTERSECT/EXCEPT
Non-destructive: Shows toast error if SQL can't be parsed; buffer unchanged
Single undo step: Ctrl+Z reverts the entire format operation
16 new unit tests including round-trip reparse verification ensuring formatted SQL is always valid

Example

Before (single line):

SELECTu.id, u.name, o.totalFROM users u JOIN orders o ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

After (Ctrl+Shift+F):

SELECTu.id,
u.name,
o.totalFROM users AS u
JOIN orders AS o
ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

Test plan

cargo build compiles without warnings
cargo test — all 232 tests pass (16 new formatter tests)
Formatter produces valid SQL (round-trip reparse test)
Multi-column SELECT indentation
JOIN/WHERE/GROUP BY/ORDER BY each on own line
CTE formatting
INSERT/UPDATE/DELETE formatting
Help overlay shows new shortcut

Closes#33

🤖 Generated with Claude Code

Adds a built-in SQL pretty-printer that formats messy queries into well-indented, readable SQL using the existing AST parse→compile pipeline. Triggered via Ctrl+Shift+F in the editor. - New `ast::formatter` module with `format_sql()` function - Multi-line output: each SQL clause (SELECT, FROM, WHERE, JOIN, GROUP BY, ORDER BY, LIMIT, OFFSET) on its own line - Indented column lists for multi-column SELECT - JOIN conditions indented under their JOIN clause - Supports all query types: SELECT, INSERT, UPDATE, DELETE, CTEs - Non-destructive: shows toast error on parse failure - Single undo step to revert formatting - 16 unit tests including round-trip reparse verification - Help overlay updated with new shortcut Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflicts in app.rs and components.rs by keeping both the SQL formatter feature and autocomplete additions from main. Run cargo fmt for consistent formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

muk2 · 2026-02-19T22:36:38Z

Summary

Implements #33 — adds a built-in SQL query formatter that auto-formats messy or one-line SQL into well-indented, readable SQL directly in the editor.

New ast::formatter module with format_sql() function that pretty-prints Query AST nodes
Shortcut: Ctrl+Shift+F in the editor formats the entire buffer
Multi-line formatting: Each major SQL clause on its own line (SELECT, FROM, WHERE, JOIN, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET)
Indented projections: Multi-column SELECT lists get one column per line with proper indentation
JOIN formatting: JOIN conditions indented under their JOIN clause
All query types: SELECT, INSERT, UPDATE, DELETE, CTEs, UNION/INTERSECT/EXCEPT
Non-destructive: Shows toast error if SQL can't be parsed; buffer unchanged
Single undo step: Ctrl+Z reverts the entire format operation
16 new unit tests including round-trip reparse verification ensuring formatted SQL is always valid

Example

Before (single line):

SELECTu.id, u.name, o.totalFROM users u JOIN orders o ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

After (Ctrl+Shift+F):

SELECTu.id,
u.name,
o.totalFROM users AS u
JOIN orders AS o
ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

Test plan

cargo build compiles without warnings
cargo test — all 232 tests pass (16 new formatter tests)
Formatter produces valid SQL (round-trip reparse test)
Multi-column SELECT indentation
JOIN/WHERE/GROUP BY/ORDER BY each on own line
CTE formatting
INSERT/UPDATE/DELETE formatting
Help overlay shows new shortcut

Closes#33

🤖 Generated with Claude Code

Adds a built-in SQL pretty-printer that formats messy queries into well-indented, readable SQL using the existing AST parse→compile pipeline. Triggered via Ctrl+Shift+F in the editor. - New `ast::formatter` module with `format_sql()` function - Multi-line output: each SQL clause (SELECT, FROM, WHERE, JOIN, GROUP BY, ORDER BY, LIMIT, OFFSET) on its own line - Indented column lists for multi-column SELECT - JOIN conditions indented under their JOIN clause - Supports all query types: SELECT, INSERT, UPDATE, DELETE, CTEs - Non-destructive: shows toast error on parse failure - Single undo step to revert formatting - 16 unit tests including round-trip reparse verification - Help overlay updated with new shortcut Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflicts in app.rs and components.rs by keeping both the SQL formatter feature and autocomplete additions from main. Run cargo fmt for consistent formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

muk2 · 2026-02-19T22:36:38Z

Summary

Implements #33 — adds a built-in SQL query formatter that auto-formats messy or one-line SQL into well-indented, readable SQL directly in the editor.

New ast::formatter module with format_sql() function that pretty-prints Query AST nodes
Shortcut: Ctrl+Shift+F in the editor formats the entire buffer
Multi-line formatting: Each major SQL clause on its own line (SELECT, FROM, WHERE, JOIN, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET)
Indented projections: Multi-column SELECT lists get one column per line with proper indentation
JOIN formatting: JOIN conditions indented under their JOIN clause
All query types: SELECT, INSERT, UPDATE, DELETE, CTEs, UNION/INTERSECT/EXCEPT
Non-destructive: Shows toast error if SQL can't be parsed; buffer unchanged
Single undo step: Ctrl+Z reverts the entire format operation
16 new unit tests including round-trip reparse verification ensuring formatted SQL is always valid

Example

Before (single line):

SELECTu.id, u.name, o.totalFROM users u JOIN orders o ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

After (Ctrl+Shift+F):

SELECTu.id,
u.name,
o.totalFROM users AS u
JOIN orders AS o
ONu.id=o.user_idWHEREo.total>100ORDER BYo.totalDESCLIMIT10

Test plan

cargo build compiles without warnings
cargo test — all 232 tests pass (16 new formatter tests)
Formatter produces valid SQL (round-trip reparse test)
Multi-column SELECT indentation
JOIN/WHERE/GROUP BY/ORDER BY each on own line
CTE formatting
INSERT/UPDATE/DELETE formatting
Help overlay shows new shortcut

Closes#33

🤖 Generated with Claude Code

Adds a built-in SQL pretty-printer that formats messy queries into well-indented, readable SQL using the existing AST parse→compile pipeline. Triggered via Ctrl+Shift+F in the editor. - New `ast::formatter` module with `format_sql()` function - Multi-line output: each SQL clause (SELECT, FROM, WHERE, JOIN, GROUP BY, ORDER BY, LIMIT, OFFSET) on its own line - Indented column lists for multi-column SELECT - JOIN conditions indented under their JOIN clause - Supports all query types: SELECT, INSERT, UPDATE, DELETE, CTEs - Non-destructive: shows toast error on parse failure - Single undo step to revert formatting - 16 unit tests including round-trip reparse verification - Help overlay updated with new shortcut Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Resolve merge conflicts in app.rs and components.rs by keeping both the SQL formatter feature and autocomplete additions from main. Run cargo fmt for consistent formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

muk2and others added 2 commits February 19, 2026 22:36

Conversation

muk2 commented Feb 19, 2026

Summary

Example

Test plan

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

muk2 commented Feb 19, 2026

Summary

Example

Test plan

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

muk2 commented Feb 19, 2026

Summary

Example

Test plan

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

muk2 commented Feb 19, 2026

Summary

Example

Test plan

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

muk2 commented Feb 19, 2026

Summary

Example

Test plan

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

muk2 commented Feb 19, 2026

Summary

Example

Test plan

Uh oh!

Reviewers

Assignees

Labels

Projects