fix: fix toSnakeCase to handle input in CamelCase format (#2245)

orisano · web-flow · commit a5b691cdd242 · 2023-06-06T11:09:53.000-07:00
diff --git a/internal/codegen/golang/field.go b/internal/codegen/golang/field.go
@@ -2,6 +2,7 @@ package golang
 
 import (
 	"fmt"
+	"regexp"
 	"sort"
 	"strings"
 
@@ -57,7 +58,14 @@ func SetCaseStyle(name string, style string) string {
 	}
 }
 
+var camelPattern = regexp.MustCompile("[^A-Z][A-Z]+")
+
 func toSnakeCase(s string) string {
+	if !strings.ContainsRune(s, '_') {
+		s = camelPattern.ReplaceAllStringFunc(s, func(x string) string {
+			return x[:1] + "_" + x[1:]
+		})
+	}
 	return strings.ToLower(s)
 }
 
diff --git a/internal/codegen/golang/result.go b/internal/codegen/golang/result.go
@@ -335,7 +335,7 @@ func columnsToStruct(req *plugin.CodeGenRequest, name string, columns []goColumn
 		colName := columnName(c.Column, i)
 		tagName := colName
 
-		// overide col/tag with expected model name
+		// override col/tag with expected model name
 		if c.embed != nil {
 			colName = c.embed.modelName
 			tagName = SetCaseStyle(colName, "snake")
diff --git a/internal/endtoend/testdata/sqlc_embed/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/sqlc_embed/postgresql/pgx/go/query.sql.go

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package golang`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "regexp"`
`5`	`6`	`"sort"`
`6`	`7`	`"strings"`
`7`	`8`
`@@ -57,7 +58,14 @@ func SetCaseStyle(name string, style string) string {`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`
	`61`	`+var camelPattern = regexp.MustCompile("[^A-Z][A-Z]+")`
	`62`	`+`
`60`	`63`	`func toSnakeCase(s string) string {`
	`64`	`+ if !strings.ContainsRune(s, '_') {`
	`65`	`+ s = camelPattern.ReplaceAllStringFunc(s, func(x string) string {`
	`66`	`+ return x[:1] + "_" + x[1:]`
	`67`	`+ })`
	`68`	`+ }`
`61`	`69`	`return strings.ToLower(s)`
`62`	`70`	`}`
`63`	`71`