Remove TitleCases from NonZeroDefaultSet

This commit is contained in:
Aaron L 2016-09-03 11:54:23 -07:00
parent 67f72d4596
commit e1bfd9d0da
3 changed files with 3 additions and 13 deletions

View file

@ -9,18 +9,13 @@ import (
// NonZeroDefaultSet returns the fields included in the // NonZeroDefaultSet returns the fields included in the
// defaults slice that are non zero values // 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)) c := make([]string, 0, len(defaults))
val := reflect.Indirect(reflect.ValueOf(obj)) val := reflect.Indirect(reflect.ValueOf(obj))
for _, d := range defaults { for _, d := range defaults {
var fieldName string fieldName := strmangle.TitleCase(d)
if titleCases == nil {
fieldName = strmangle.TitleCase(d)
} else {
fieldName = titleCases[d]
}
field := val.FieldByName(fieldName) field := val.FieldByName(fieldName)
if !field.IsValid() { if !field.IsValid() {
panic(fmt.Sprintf("Could not find field name %s in type %T", fieldName, obj)) panic(fmt.Sprintf("Could not find field name %s in type %T", fieldName, obj))

View file

@ -59,7 +59,7 @@ func TestNonZeroDefaultSet(t *testing.T) {
} }
for i, test := range tests { for i, test := range tests {
z := NonZeroDefaultSet(test.Defaults, nil, test.Obj) z := NonZeroDefaultSet(test.Defaults, test.Obj)
if !reflect.DeepEqual(test.Ret, z) { if !reflect.DeepEqual(test.Ret, z) {
t.Errorf("[%d] mismatch:\nWant: %#v\nGot: %#v", i, test.Ret, z) t.Errorf("[%d] mismatch:\nWant: %#v\nGot: %#v", i, test.Ret, z)
} }

View file

@ -5,11 +5,6 @@ var (
{{$varNameSingular}}ColumnsWithoutDefault = []string{{"{"}}{{.Table.Columns | filterColumnsByDefault false | columnNames | stringMap .StringFuncs.quoteWrap | join ","}}{{"}"}} {{$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}}ColumnsWithDefault = []string{{"{"}}{{.Table.Columns | filterColumnsByDefault true | columnNames | stringMap .StringFuncs.quoteWrap | join ","}}{{"}"}}
{{$varNameSingular}}PrimaryKeyColumns = []string{{"{"}}{{.Table.PKey.Columns | 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 ( type (