Renamed templateFilter allow property to ignore. Dropped the allow word from the vairbales.
This commit is contained in:
parent
85fdfb01b3
commit
b0636c27ca
1 changed files with 18 additions and 18 deletions
|
|
@ -51,14 +51,14 @@ var (
|
||||||
viewPkg string
|
viewPkg string
|
||||||
enumPkg string
|
enumPkg string
|
||||||
|
|
||||||
allowTables string
|
tables string
|
||||||
allowViews string
|
views string
|
||||||
allowEnums string
|
enums string
|
||||||
)
|
)
|
||||||
|
|
||||||
type templateFilter struct {
|
type templateFilter struct {
|
||||||
names []string
|
names []string
|
||||||
allow bool
|
ignore bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
@ -94,9 +94,9 @@ func init() {
|
||||||
flag.StringVar(&viewPkg, "rel-view-path", "view", "Relative path for the View files package from the destination directory.")
|
flag.StringVar(&viewPkg, "rel-view-path", "view", "Relative path for the View files package from the destination directory.")
|
||||||
flag.StringVar(&enumPkg, "rel-enum-path", "enum", "Relative path for the Enum files package from the destination directory.")
|
flag.StringVar(&enumPkg, "rel-enum-path", "enum", "Relative path for the Enum files package from the destination directory.")
|
||||||
|
|
||||||
flag.StringVar(&allowTables, "tables", "", `Comma-separated list of tables to allow.`)
|
flag.StringVar(&tables, "tables", "", `Comma-separated list of tables to generate.`)
|
||||||
flag.StringVar(&allowViews, "views", "", `Comma-separated list of views to allow.`)
|
flag.StringVar(&views, "views", "", `Comma-separated list of views to generate.`)
|
||||||
flag.StringVar(&allowEnums, "enums", "", `Comma-separated list of enums to allow.`)
|
flag.StringVar(&enums, "enums", "", `Comma-separated list of enums to generate.`)
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
@ -108,9 +108,9 @@ func main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
source := getSource()
|
source := getSource()
|
||||||
tablesFilter := createTemplateFilter(ignoreTables, allowTables, "tables")
|
tablesFilter := createTemplateFilter(ignoreTables, tables, "tables")
|
||||||
viewsFilter := createTemplateFilter(ignoreViews, allowViews, "views")
|
viewsFilter := createTemplateFilter(ignoreViews, views, "views")
|
||||||
enumsFilter := createTemplateFilter(ignoreEnums, allowEnums, "enums")
|
enumsFilter := createTemplateFilter(ignoreEnums, enums, "enums")
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
|
@ -319,28 +319,28 @@ func createTemplateFilter(ignoreList, allowList, filterType string) templateFilt
|
||||||
if allowList != "" {
|
if allowList != "" {
|
||||||
return templateFilter{
|
return templateFilter{
|
||||||
names: parseList(allowList),
|
names: parseList(allowList),
|
||||||
allow: true,
|
ignore: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return templateFilter{
|
return templateFilter{
|
||||||
names: parseList(ignoreList),
|
names: parseList(ignoreList),
|
||||||
allow: false,
|
ignore: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func shouldSkipTable(table metadata.Table, filter templateFilter) bool {
|
func shouldSkipTable(table metadata.Table, filter templateFilter) bool {
|
||||||
if filter.allow {
|
if filter.ignore {
|
||||||
return !strslice.Contains(filter.names, strings.ToLower(table.Name))
|
return strslice.Contains(filter.names, strings.ToLower(table.Name))
|
||||||
}
|
}
|
||||||
|
|
||||||
return strslice.Contains(filter.names, strings.ToLower(table.Name))
|
return !strslice.Contains(filter.names, strings.ToLower(table.Name))
|
||||||
}
|
}
|
||||||
|
|
||||||
func shouldSkipEnum(enum metadata.Enum, filter templateFilter) bool {
|
func shouldSkipEnum(enum metadata.Enum, filter templateFilter) bool {
|
||||||
if filter.allow {
|
if filter.ignore {
|
||||||
return !strslice.Contains(filter.names, strings.ToLower(enum.Name))
|
return strslice.Contains(filter.names, strings.ToLower(enum.Name))
|
||||||
}
|
}
|
||||||
|
|
||||||
return strslice.Contains(filter.names, strings.ToLower(enum.Name))
|
return !strslice.Contains(filter.names, strings.ToLower(enum.Name))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue