Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions transformers/struct.go
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ func DefaultNameTransformer(field reflect.StructField) (string, error) {
if jsonTag == "-" {
return "", nil
}
if schema.ValidColumnName(jsonTag) {
name = jsonTag
if nameFromJSONTag := defaultCaser.ToSnake(jsonTag); schema.ValidColumnName(nameFromJSONTag) {
return nameFromJSONTag, nil
}
}
return defaultCaser.ToSnake(name), nil
Expand Down
7 changes: 6 additions & 1 deletion transformers/struct_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ type (
}

testFunnyStruct struct {
AFunnyLookingField string `json:"OS-EXT:a-funny-looking-field"`
AFunnyLookingField string `json:"OS-EXT:a-funny-looking-field"`
AFieldWithCamelCaseName string `json:"camelCaseName"`
}
)

Expand Down Expand Up @@ -255,6 +256,10 @@ var (
Name: "a_funny_looking_field",
Type: schema.TypeString,
},
{
Name: "camel_case_name",
Type: schema.TypeString,
},
},
}
)
Expand Down