Skip to content
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

fix(golang): escape q field name #3647

Merged
merged 1 commit into from
Nov 25, 2024
Merged

fix(golang): escape q field name #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions internal/codegen/golang/reserved.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ func IsReserved(s string) bool {
return true
case "var":
return true
case "q":
return true
default:
return false
}
Expand Down
1 change: 1 addition & 0 deletions internal/endtoend/testdata/params_go_keywords/postgresql/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.

20 changes: 20 additions & 0 deletions internal/endtoend/testdata/params_go_keywords/postgresql/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.

6 changes: 6 additions & 0 deletions internal/endtoend/testdata/params_go_keywords/postgresql/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ SELECT sqlc.arg('return')::text;
-- name: KeywordVar :exec
SELECT sqlc.arg('var')::text;

-- name: KeywordQ :exec
SELECT sqlc.arg('q')::text;

-- name: SelectBreak :one
SELECT "break" FROM go_keywords;

Expand Down Expand Up @@ -147,3 +150,6 @@ SELECT "return" FROM go_keywords;

-- name: SelectVar :one
SELECT "var" FROM go_keywords;

-- name: SelectQ :one
SELECT "q" FROM go_keywords;
3 changes: 2 additions & 1 deletion internal/endtoend/testdata/params_go_keywords/postgresql/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ CREATE TABLE go_keywords (
"for" TEXT,
"import" TEXT,
"return" TEXT,
"var" TEXT
"var" TEXT,
"q" TEXT
);
Loading