Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
17 changes: 11 additions & 6 deletions internal/codegen/golang/struct.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@ func StructName(name string, settings *plugin.Settings) string {
if rename := settings.Rename[name]; rename != "" {
return rename
}
var (
out string
fn = func(r rune) bool {
return r == '_' || r == '-'
out := ""
name = strings.Map(func(r rune) rune {
if unicode.IsLetter(r) {
return r
}
)
for _, p := range strings.FieldsFunc(name, fn) {
if unicode.IsDigit(r) {
return r
}
return rune('_')
}, name)

for _, p := range strings.Split(name, "_") {
if p == "id" {
out += "ID"
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This tests that Go struct field names are proper Go identifiers.

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

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

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CREATE TABLE bar (
id INT NOT NULL,
"!!!nobody,_,-would-believe---this-...?!" INT,
"parent id" INT);

-- name: test :one
SELECT * from bar limit 1;
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"version": "1",
"packages": [
{
"path": "go",
"name": "querytest",
"schema": "query.sql",
"queries": "query.sql"
}
]
}