Skip to content

templates/go: disambiguate fields from digit-prefixed SQL columns #434

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

Open
rosensama wants to merge 1 commit into
base: main
Choose a base branch
from
Open

templates/go: disambiguate fields from digit-prefixed SQL columns #434

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
18 changes: 17 additions & 1 deletion templates/go/go.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"strconv"
"strings"
"text/template"
"unicode"

"github.com/kenshaw/inflector"
"github.com/kenshaw/snaker"
Expand Down Expand Up @@ -727,9 +728,24 @@ func convertField(ctx context.Context, tf transformFunc, f xo.Field) (Field, err
if err != nil {
return Field{}, err
}
goName := tf(f.Name)
// Disambiguate names whose leading digits get stripped by the identifier
// sanitizer: a column "1X" and "2X" both collapse to "X" otherwise.
if len(f.Name) > 0 && f.Name[0] >= '0' && f.Name[0] <= '9' {
// Sanitize characters that are legal in SQL but not Go, as snaker would
// have. Matches the Go spec's identifier rune class (Unicode letters,
// digits, underscore).
safe := strings.Map(func(r rune) rune {
if unicode.IsLetter(r) || unicode.IsDigit(r) || r == '_' {
return r
}
return '_'
}, f.Name)
goName = goName + "_" + safe
}
return Field{
Type: typ,
GoName: tf(f.Name),
GoName: goName,
SQLName: f.Name,
Zero: zero,
IsPrimary: f.IsPrimary,
Expand Down