rogee/atomctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 更新模块路径为 v2，修正文档和代码中的相关引用

Browse Source
This commit is contained in:
Rogee
2025-09-10 14:54:16 +08:00
parent 8bcc2cbdad
commit 0d05d70fb1
18 changed files with 328 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
cmd/gen_model.go
View File

@@ -6,7 +6,7 @@ import (
"regexp"
"strings"
astModel "go.ipao.vip/atomctl/pkg/ast/model"
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"
@@ -19,22 +19,22 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.ipao.vip/atomctl/pkg/ast/model"
pgDatabase "go.ipao.vip/atomctl/pkg/postgres"
"go.ipao.vip/atomctl/pkg/utils/gomod"
"go.ipao.vip/atomctl/v2/pkg/ast/model"
pgDatabase "go.ipao.vip/atomctl/v2/pkg/postgres"
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
)
func CommandGenModel(root *cobra.Command) {
cmd := &cobra.Command{
Use: "model",
Aliases: []string{"m"},
Short: "Generate jet models",
RunE: commandGenModelE,
}
cmd := &cobra.Command{
Use: "model",
Aliases: []string{"m"},
Short: "Generate jet 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")
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,15 +44,15 @@ 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")
}
_, 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
}
// optional schema override
if s := cmd.Flag("schema").Value.String(); s != "" {
dbConf.Schema = s
}
v := viper.New()
v.SetConfigType("yaml")
@@ -175,16 +175,16 @@ func commandGenModelE(cmd *cobra.Command, args []string) error {
return err
}
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 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