From eeed5d4e0a52bb98b557da198b1215ba1f248bd1 Mon Sep 17 00:00:00 2001 From: Merlin Ran Date: Sun, 30 Nov 2025 18:51:49 -0500 Subject: [PATCH 1/2] strings.Replace->strings.ReplaceAll --- internal/gen.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/gen.go b/internal/gen.go index d339650..edaefd4 100644 --- a/internal/gen.go +++ b/internal/gen.go @@ -219,9 +219,9 @@ func methodName(name string) string { var pyIdentPattern = regexp.MustCompile("[^a-zA-Z0-9_]+") func pyEnumValueName(value string) string { - id := strings.Replace(value, "-", "_", -1) - id = strings.Replace(id, ":", "_", -1) - id = strings.Replace(id, "/", "_", -1) + id := strings.ReplaceAll(value, "-", "_") + id = strings.ReplaceAll(id, ":", "_") + id = strings.ReplaceAll(id, "/", "_") id = pyIdentPattern.ReplaceAllString(id, "") return strings.ToUpper(id) } From 95289ea5f95757956486668c27d5c461357d0c27 Mon Sep 17 00:00:00 2001 From: Merlin Ran Date: Sun, 30 Nov 2025 19:42:40 -0500 Subject: [PATCH 2/2] params and return type should be CamelCased --- internal/gen.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/gen.go b/internal/gen.go index edaefd4..ca18c21 100644 --- a/internal/gen.go +++ b/internal/gen.go @@ -406,7 +406,7 @@ func buildQueries(conf Config, req *plugin.GenerateRequest, structs []Struct) ([ gq.Args = []QueryValue{{ Emit: true, Name: "arg", - Struct: columnsToStruct(req, query.Name+"Params", cols), + Struct: columnsToStruct(req, modelName(query.Name+"Params", req.Settings), cols), }} } else { args := make([]QueryValue, 0, len(query.Params)) @@ -461,7 +461,7 @@ func buildQueries(conf Config, req *plugin.GenerateRequest, structs []Struct) ([ Column: c, }) } - gs = columnsToStruct(req, query.Name+"Row", columns) + gs = columnsToStruct(req, modelName(query.Name+"Row", req.Settings), columns) emit = true } gq.Ret = QueryValue{