From 72dd2736f5b5c69e4db932dc48bd8ee89cc973c0 Mon Sep 17 00:00:00 2001 From: kesonan Date: Mon, 13 Nov 2023 19:46:17 +0800 Subject: [PATCH] change command-line arg 'table' from string to slice type (#3707) --- tools/goctl/model/cmd.go | 2 +- tools/goctl/model/sql/command/command.go | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/goctl/model/cmd.go b/tools/goctl/model/cmd.go index 32f5a843..e340f2c5 100644 --- a/tools/goctl/model/cmd.go +++ b/tools/goctl/model/cmd.go @@ -46,7 +46,7 @@ func init() { datasourceCmdFlags.StringVar(&command.VarStringBranch, "branch") 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.BoolVarP(&command.VarBoolCache, "cache", "c") pgDatasourceCmdFlags.StringVarP(&command.VarStringDir, "dir", "d") diff --git a/tools/goctl/model/sql/command/command.go b/tools/goctl/model/sql/command/command.go index dc2aabc6..e29a3092 100644 --- a/tools/goctl/model/sql/command/command.go +++ b/tools/goctl/model/sql/command/command.go @@ -35,8 +35,6 @@ var ( VarStringURL string // VarStringSliceTable describes tables. VarStringSliceTable []string - // VarStringTable describes a table of sql. - VarStringTable string // VarStringStyle describes the style. VarStringStyle string // VarStringDatabase describes the database. @@ -211,14 +209,14 @@ func PostgreSqlDataSource(_ *cobra.Command, _ []string) error { schema = "public" } - pattern := strings.TrimSpace(VarStringTable) + patterns := parseTableList(VarStringSliceTable) cfg, err := config.NewConfig(style) if err != nil { return err } 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 { @@ -330,7 +328,7 @@ func fromMysqlDataSource(arg dataSourceArg) error { 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) if len(url) == 0 { 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) for _, item := range tables { - match, err := filepath.Match(pattern, item) - if err != nil { - return err - } - - if !match { + if !pattern.Match(item) { continue }