feat: update

This commit is contained in:
Rogee
2025-09-10 15:55:51 +08:00
parent 0d05d70fb1
commit 384b723f51
10 changed files with 249 additions and 950 deletions

View File

@@ -2,40 +2,25 @@ package cmd
import (
"fmt"
"os"
"regexp"
"strings"
astModel "go.ipao.vip/atomctl/v2/pkg/ast/model"
"github.com/go-jet/jet/v2/generator/metadata"
"github.com/go-jet/jet/v2/generator/postgres"
"github.com/go-jet/jet/v2/generator/template"
pg "github.com/go-jet/jet/v2/postgres"
"github.com/jackc/pgconn"
_ "github.com/lib/pq"
"github.com/pkg/errors"
"github.com/samber/lo"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.ipao.vip/atomctl/v2/pkg/ast/model"
pgDatabase "go.ipao.vip/atomctl/v2/pkg/postgres"
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
"go.ipao.vip/gen"
"gorm.io/driver/postgres"
"gorm.io/gorm"
)
func CommandGenModel(root *cobra.Command) {
cmd := &cobra.Command{
Use: "model",
Aliases: []string{"m"},
Short: "Generate jet models",
Short: "Generate models",
RunE: commandGenModelE,
}
cmd.Flags().String("schema", "", "Override database schema")
cmd.Flags().Bool("rename-schemas", true, "Rename generated database/<db> to database/schemas")
cmd.Flags().String("schemas-out", "database/schemas", "Schemas output directory when renaming")
root.AddCommand(cmd)
}
@@ -44,150 +29,79 @@ func commandGenModelE(cmd *cobra.Command, args []string) error {
return errors.Wrap(err, "parse go.mod")
}
_, dbConf, err := pgDatabase.GetDB(cmd.Flag("config").Value.String())
if err != nil {
return errors.Wrap(err, "get db")
}
// optional schema override
if s := cmd.Flag("schema").Value.String(); s != "" {
dbConf.Schema = s
cfgFile := cmd.Flag("config").Value.String()
if cfgFile == "" {
cfgFile = "config.toml"
}
v := viper.New()
v.SetConfigType("yaml")
v.SetConfigFile("database/transform.yaml")
v.SetConfigType("toml")
v.SetConfigFile(cfgFile)
v.AddConfigPath(".")
if err := v.ReadInConfig(); err != nil {
return err
return errors.Wrap(err, "read config")
}
var transformer model.Transformer
if err := v.Unmarshal(&transformer); err != nil {
return err
var dbc modelDBConfig
if err := v.UnmarshalKey("Database", &dbc); err != nil {
return errors.Wrap(err, "unmarshal Database config")
}
dsn := dbc.DSN()
jsonReg := regexp.MustCompile(`Json\[\[?\]?(\w+)\]`)
builtinTypes := []string{
"string",
"int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64",
"float32", "float64",
"bool",
}
log.Infof("parsed DSN: %s (schema=%s)", dsn, dbc.Schema)
generatedTables := []string{}
err = postgres.GenerateDSN(
dbConf.DSN(),
dbConf.Schema,
"database",
template.Default(pg.Dialect).
UseSchema(func(schema metadata.Schema) template.Schema {
return template.
DefaultSchema(schema).
UseSQLBuilder(
template.
DefaultSQLBuilder().
UseTable(func(table metadata.Table) template.TableSQLBuilder {
tbl := template.DefaultTableSQLBuilder(table)
if lo.Contains(transformer.Ignores.Jet, table.Name) {
tbl.Skip = true
log.Infof("Skip table %s", table.Name)
}
return tbl
}).
UseEnum(func(meta metadata.Enum) template.EnumSQLBuilder {
enum := template.DefaultEnumSQLBuilder(meta)
if lo.Contains(transformer.Ignores.Jet, meta.Name) {
enum.Skip = true
log.Infof("Skip enum %s", meta.Name)
}
return enum
}),
).
UseModel(
template.
DefaultModel().
UseEnum(func(meta metadata.Enum) template.EnumModel {
enum := template.DefaultEnumModel(meta)
if lo.Contains(transformer.Ignores.Jet, meta.Name) {
enum.Skip = true
log.Infof("Skip enum %s", meta.Name)
}
return enum
}).
UseTable(func(table metadata.Table) template.TableModel {
tbl := template.DefaultTableModel(table)
if lo.Contains(transformer.Ignores.Jet, table.Name) {
tbl.Skip = true
log.Infof("Skip table %s", table.Name)
return tbl
}
generatedTables = append(generatedTables, table.Name)
return tbl.UseField(func(column metadata.Column) template.TableModelField {
defaultTableModelField := template.DefaultTableModelField(column)
defaultTableModelField = defaultTableModelField.UseTags(fmt.Sprintf(`json:"%s"`, column.Name))
if schema.Name != dbConf.Schema {
return defaultTableModelField
}
fields, ok := transformer.Types[table.Name]
if !ok {
return defaultTableModelField
}
toType, ok := fields[column.Name]
if !ok {
return defaultTableModelField
}
// toType = jsonReg.ReplaceAllString(toType, "fields.$1")
if jsonReg.MatchString(toType) {
matches := jsonReg.FindStringSubmatch(toType)
if len(matches) == 2 && !lo.Contains(builtinTypes, matches[1]) {
toType = strings.Replace(toType, matches[1], "fields."+matches[1], 1)
}
}
defaultTableModelField = defaultTableModelField.
UseType(template.Type{
Name: fmt.Sprintf("fields.%s", toType),
ImportPath: fmt.Sprintf("%s/database/fields", gomod.GetModuleName()),
})
log.Infof("Convert table %s field %s type to : %s", table.Name, column.Name, toType)
return defaultTableModelField
})
}),
)
}),
)
db, err := gorm.Open(postgres.New(postgres.Config{DSN: dsn}))
if err != nil {
return err
return errors.Wrapf(err, "open database with dsn: %s", dsn)
}
cfg, err := pgconn.ParseConfig(dbConf.DSN())
if err != nil {
return err
}
// 默认同包同目录生成到 ./database
gen.GenerateWithDefault(db, "./database/.transform.yaml")
if rename, _ := cmd.Flags().GetBool("rename-schemas"); rename {
out := cmd.Flag("schemas-out").Value.String()
if err := os.RemoveAll(out); err != nil {
return err
}
dataPath := fmt.Sprintf("database/%s", cfg.Database)
if err := os.Rename(dataPath, out); err != nil {
return err
}
}
if err := astModel.Generate(generatedTables, transformer); err != nil {
return err
}
return nil
}
// local config and helpers
type modelDBConfig struct {
Username string
Password string
Database string
Schema string
Host string
Port uint
SslMode string
TimeZone string
}
func (c *modelDBConfig) applyDefaults() {
if c.Username == "" {
c.Username = "postgres"
}
if c.SslMode == "" {
c.SslMode = "disable"
}
if c.TimeZone == "" {
c.TimeZone = "Asia/Shanghai"
}
if c.Port == 0 {
c.Port = 5432
}
if c.Schema == "" {
c.Schema = "public"
}
}
func (c *modelDBConfig) DSN() string {
c.applyDefaults()
return fmt.Sprintf(
"host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s",
c.Host,
c.Username,
c.Password,
c.Database,
c.Port,
c.SslMode,
c.TimeZone,
)
}