Remove TitleCases from NonZeroDefaultSet
This commit is contained in:
parent
67f72d4596
commit
e1bfd9d0da
3 changed files with 3 additions and 13 deletions
|
@ -9,18 +9,13 @@ import (
|
|||
|
||||
// NonZeroDefaultSet returns the fields included in the
|
||||
// defaults slice that are non zero values
|
||||
func NonZeroDefaultSet(defaults []string, titleCases map[string]string, obj interface{}) []string {
|
||||
func NonZeroDefaultSet(defaults []string, obj interface{}) []string {
|
||||
c := make([]string, 0, len(defaults))
|
||||
|
||||
val := reflect.Indirect(reflect.ValueOf(obj))
|
||||
|
||||
for _, d := range defaults {
|
||||
var fieldName string
|
||||
if titleCases == nil {
|
||||
fieldName = strmangle.TitleCase(d)
|
||||
} else {
|
||||
fieldName = titleCases[d]
|
||||
}
|
||||
fieldName := strmangle.TitleCase(d)
|
||||
field := val.FieldByName(fieldName)
|
||||
if !field.IsValid() {
|
||||
panic(fmt.Sprintf("Could not find field name %s in type %T", fieldName, obj))
|
||||
|
|
|
@ -59,7 +59,7 @@ func TestNonZeroDefaultSet(t *testing.T) {
|
|||
}
|
||||
|
||||
for i, test := range tests {
|
||||
z := NonZeroDefaultSet(test.Defaults, nil, test.Obj)
|
||||
z := NonZeroDefaultSet(test.Defaults, test.Obj)
|
||||
if !reflect.DeepEqual(test.Ret, z) {
|
||||
t.Errorf("[%d] mismatch:\nWant: %#v\nGot: %#v", i, test.Ret, z)
|
||||
}
|
||||
|
|
|
@ -5,11 +5,6 @@ var (
|
|||
{{$varNameSingular}}ColumnsWithoutDefault = []string{{"{"}}{{.Table.Columns | filterColumnsByDefault false | columnNames | stringMap .StringFuncs.quoteWrap | join ","}}{{"}"}}
|
||||
{{$varNameSingular}}ColumnsWithDefault = []string{{"{"}}{{.Table.Columns | filterColumnsByDefault true | columnNames | stringMap .StringFuncs.quoteWrap | join ","}}{{"}"}}
|
||||
{{$varNameSingular}}PrimaryKeyColumns = []string{{"{"}}{{.Table.PKey.Columns | stringMap .StringFuncs.quoteWrap | join ", "}}{{"}"}}
|
||||
{{$varNameSingular}}TitleCases = map[string]string{
|
||||
{{range $col := .Table.Columns | columnNames -}}
|
||||
"{{$col}}": "{{titleCase $col}}",
|
||||
{{end -}}
|
||||
}
|
||||
)
|
||||
|
||||
type (
|
||||
|
|
Loading…
Add table
Reference in a new issue