Skip to content
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into fix-sqlite-order-by-args
* origin/main: (91 commits)
  build(deps): bump urllib3 from 2.6.2 to 2.6.3 in /docs (#4259)
  build(deps): bump golang from 1.26.0 to 1.26.1 (#4328)
  build(deps): bump the production-dependencies group across 1 directory with 4 updates (#4348)
  Upgrade Go version to 1.26.0 (#4312)
  Install PostgreSQL from theseus-rs/postgresql-binaries instead of apt (#4310)
  build(deps): bump golang from 1.25.5 to 1.26.0 (#4294)
  build(deps): bump the production-dependencies group across 1 directory with 2 updates (#4296)
  Add sqlc-test-setup command for database test environment setup (#4304)
  build(deps): bump filippo.io/edwards25519 from 1.1.0 to 1.1.1 (#4303)
  build(deps): bump the production-dependencies group across 1 directory with 4 updates (#4284)
  feat: add ClickHouse support to `sqlc parse` (#4267)
  Add GitHub Topic to the plugins page (#4258)
  build(deps): bump the production-dependencies group across 1 directory with 2 updates (#4256)
  build(deps): bump the production-dependencies group across 1 directory with 4 updates (#4248)
  fix(native): make MySQL connection check immediate on first attempt (#4254)
  feat: graduate parsecmd experiment (#4253)
  docs: Add Claude Code remote environment setup instructions (#4246)
  Add parse subcommand with AST JSON output (#4240)
  feat(postgresql): add analyzerv2 experiment for database-only analysis (#4237)
  feat: add native database support for e2e tests without Docker (#4236)
  ...

# Conflicts:
#	internal/engine/sqlite/convert.go
  • Loading branch information
khepin committed Apr 15, 2026
commit ebbbebd47bbdc0093e6fe92d71306200a3479bdd
5 changes: 4 additions & 1 deletion internal/engine/sqlite/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,10 @@ func (c *cc) convertMultiSelect_stmtContext(n *parser.Select_stmtContext) ast.No
selectStmt.LimitCount = limitCount
selectStmt.LimitOffset = limitOffset
selectStmt.SortClause = sortClause
selectStmt.WithClause = &ast.WithClause{Ctes: &ctes}
// Only set WithClause if there are CTEs
if len(ctes.Items) > 0 {
selectStmt.WithClause = &ast.WithClause{Ctes: &ctes}
}
return selectStmt
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.