github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

change command-line arg 'table' from string to slice type (#3707)

Browse Source
This commit is contained in:
kesonan 2023-11-13 19:46:17 +08:00 committed by GitHub
parent 24695bba09
commit 72dd2736f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/goctl/model/cmd.go
View File

@ -46,7 +46,7 @@ func init() {
datasourceCmdFlags.StringVar(&command.VarStringBranch, "branch") datasourceCmdFlags.StringVar(&command.VarStringBranch, "branch")
pgDatasourceCmdFlags.StringVar(&command.VarStringURL, "url") pgDatasourceCmdFlags.StringVar(&command.VarStringURL, "url")
pgDatasourceCmdFlags.StringVarP(&command.VarStringTable, "table", "t") pgDatasourceCmdFlags.StringSliceVarP(&command.VarStringSliceTable, "table", "t")
pgDatasourceCmdFlags.StringVarPWithDefaultValue(&command.VarStringSchema, "schema", "s", "public") pgDatasourceCmdFlags.StringVarPWithDefaultValue(&command.VarStringSchema, "schema", "s", "public")
pgDatasourceCmdFlags.BoolVarP(&command.VarBoolCache, "cache", "c") pgDatasourceCmdFlags.BoolVarP(&command.VarBoolCache, "cache", "c")
pgDatasourceCmdFlags.StringVarP(&command.VarStringDir, "dir", "d") pgDatasourceCmdFlags.StringVarP(&command.VarStringDir, "dir", "d")

15
tools/goctl/model/sql/command/command.go
View File

@ -35,8 +35,6 @@ var (
VarStringURL string VarStringURL string
// VarStringSliceTable describes tables. // VarStringSliceTable describes tables.
VarStringSliceTable []string VarStringSliceTable []string
// VarStringTable describes a table of sql.
VarStringTable string
// VarStringStyle describes the style. // VarStringStyle describes the style.
VarStringStyle string VarStringStyle string
// VarStringDatabase describes the database. // VarStringDatabase describes the database.
@ -211,14 +209,14 @@ func PostgreSqlDataSource(_ *cobra.Command, _ []string) error {
schema = "public" schema = "public"
} }
pattern := strings.TrimSpace(VarStringTable) patterns := parseTableList(VarStringSliceTable)
cfg, err := config.NewConfig(style) cfg, err := config.NewConfig(style)
if err != nil { if err != nil {
return err return err
} }
ignoreColumns := mergeColumns(VarStringSliceIgnoreColumns) ignoreColumns := mergeColumns(VarStringSliceIgnoreColumns)
return fromPostgreSqlDataSource(url, pattern, dir, schema, cfg, cache, idea, VarBoolStrict, ignoreColumns) return fromPostgreSqlDataSource(url, patterns, dir, schema, cfg, cache, idea, VarBoolStrict, ignoreColumns)
} }
type ddlArg struct { type ddlArg struct {
@ -330,7 +328,7 @@ func fromMysqlDataSource(arg dataSourceArg) error {
return generator.StartFromInformationSchema(matchTables, arg.cache, arg.strict) return generator.StartFromInformationSchema(matchTables, arg.cache, arg.strict)
} }
func fromPostgreSqlDataSource(url, pattern, dir, schema string, cfg *config.Config, cache, idea, strict bool, ignoreColumns []string) error { func fromPostgreSqlDataSource(url string, pattern pattern, dir, schema string, cfg *config.Config, cache, idea, strict bool, ignoreColumns []string) error {
log := console.NewConsole(idea) log := console.NewConsole(idea)
if len(url) == 0 { if len(url) == 0 {
log.Error("%v", "expected data source of postgresql, but nothing found") log.Error("%v", "expected data source of postgresql, but nothing found")
@ -351,12 +349,7 @@ func fromPostgreSqlDataSource(url, pattern, dir, schema string, cfg *config.Conf
matchTables := make(map[string]*model.Table) matchTables := make(map[string]*model.Table)
for _, item := range tables { for _, item := range tables {
match, err := filepath.Match(pattern, item) if !pattern.Match(item) {
if err != nil {
return err
}
if !match {
continue continue
} }