offline-labs/gas-stack
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: create helper function for computing a table's generated type-name

Browse Source
This commit is contained in:
wispem-wantex 2025-12-12 22:37:29 -08:00
parent d9df69eccf
commit a32bf873c9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/codegen/modelgenerate/generate_model.go
View File

@ -7,8 +7,6 @@ import (
"go/token" "go/token"
"strings" "strings"
"github.com/jinzhu/inflection"
"git.offline-twitter.com/offline-labs/gas-stack/pkg/schema" "git.offline-twitter.com/offline-labs/gas-stack/pkg/schema"
"git.offline-twitter.com/offline-labs/gas-stack/pkg/textutils" "git.offline-twitter.com/offline-labs/gas-stack/pkg/textutils"
) )
@ -40,7 +38,7 @@ func GenerateModelAST(table schema.Table) *ast.GenDecl {
if col.IsForeignKey && strings.HasSuffix(col.Name, "_id") { if col.IsForeignKey && strings.HasSuffix(col.Name, "_id") {
fields = append(fields, &ast.Field{ fields = append(fields, &ast.Field{
Names: []*ast.Ident{ast.NewIdent(textutils.SnakeToCamel(strings.TrimSuffix(col.Name, "_id")) + "ID")}, Names: []*ast.Ident{ast.NewIdent(textutils.SnakeToCamel(strings.TrimSuffix(col.Name, "_id")) + "ID")},
Type: ast.NewIdent(textutils.SnakeToCamel(inflection.Singular(col.ForeignKeyTargetTable) + "ID")), Type: ast.NewIdent(schema.TypenameFromTablename(col.ForeignKeyTargetTable) + "ID"),
Tag: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("`db:\"%s\" json:\"%s\"`", col.Name, col.Name)}, Tag: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("`db:\"%s\" json:\"%s\"`", col.Name, col.Name)},
}) })
} else { } else {

6
pkg/schema/parse.go
View File

@ -40,7 +40,7 @@ func SchemaFromDB(db *sqlx.DB) Schema {
var tables []Table var tables []Table
PanicIf(db.Select(&tables, `select name, is_strict, is_without_rowid from tables`)) PanicIf(db.Select(&tables, `select name, is_strict, is_without_rowid from tables`))
for _, tbl := range tables { for _, tbl := range tables {
tbl.TypeName = textutils.SnakeToCamel(inflection.Singular(tbl.TableName)) tbl.TypeName = TypenameFromTablename(tbl.TableName)
tbl.TypeIDName = tbl.TypeName + "ID" tbl.TypeIDName = tbl.TypeName + "ID"
tbl.VarName = strings.ToLower(string(tbl.TableName[0])) tbl.VarName = strings.ToLower(string(tbl.TableName[0]))
@ -56,3 +56,7 @@ func SchemaFromDB(db *sqlx.DB) Schema {
} }
return ret return ret
} }
func TypenameFromTablename(tablename string) string {
return textutils.SnakeToCamel(inflection.Singular(tablename))
}