Skip to content

Preserve MySQL optimizer hints in generated query text #4382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyleconroy merged 2 commits into from
Apr 17, 2026
Merged

Preserve MySQL optimizer hints in generated query text #4382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
229e59c
Preserve MySQL optimizer hints in stripped query text
kyleconroy Apr 17, 2026
9636fb9
Drop unit test; end-to-end coverage is sufficient
kyleconroy Apr 17, 2026
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
31 changes: 31 additions & 0 deletions internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/query.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions internal/endtoend/testdata/mysql_optimizer_hints/mysql/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
-- name: InlineHint :one
SELECT /*+ MAX_EXECUTION_TIME(1000) */ bar FROM foo LIMIT 1;

-- name: MultilineHint :one
SELECT
/*+ MAX_EXECUTION_TIME(1000) */
bar
FROM foo
LIMIT 1;
1 change: 1 addition & 0 deletions internal/endtoend/testdata/mysql_optimizer_hints/mysql/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CREATE TABLE foo (bar text);
12 changes: 12 additions & 0 deletions internal/endtoend/testdata/mysql_optimizer_hints/mysql/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "1",
"packages": [
{
"path": "go",
"engine": "mysql",
"name": "querytest",
"schema": "schema.sql",
"queries": "query.sql"
}
]
}
6 changes: 6 additions & 0 deletions internal/source/code.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ func StripComments(sql string) (string, []string, error) {
continue
}
if strings.HasPrefix(t, "/*") && strings.HasSuffix(t, "*/") {
// Preserve MySQL optimizer hints, which share block-comment
// syntax but are semantically part of the query.
if strings.HasPrefix(t, "/*+") {
lines = append(lines, t)
continue
}
t = strings.TrimPrefix(t, "/*")
t = strings.TrimSuffix(t, "*/")
comments = append(comments, t)
Expand Down
Loading