Skip to content

Commit 03343f1

Browse files
committed
fix: escape constant names in queries
Also adds `any` as a reserved keyword, as it was introduced in Go 1.18. Signed-off-by: Prajwal S N <[email protected]>
1 parent 34f8c1b commit 03343f1

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

internal/codegen/golang/reserved.go

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ func escape(s string) string {
99

1010
func IsReserved(s string) bool {
1111
switch s {
12+
case "any":
13+
return true
1214
case "break":
1315
return true
1416
case "default":

internal/codegen/golang/result.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func buildQueries(req *plugin.GenerateRequest, options *opts.Options, structs []
218218

219219
gq := Query{
220220
Cmd: query.Cmd,
221-
ConstantName: constantName,
221+
ConstantName: escape(constantName),
222222
FieldName: sdk.LowerTitle(query.Name) + "Stmt",
223223
MethodName: query.Name,
224224
SourceName: query.Filename,

internal/endtoend/testdata/any/pgx/v4/go/query.sql.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/any/pgx/v5/go/query.sql.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/any/stdlib/go/query.sql.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)