Skip to content
Open
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: 4 additions & 0 deletions query/encode.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ func reflectValue(values url.Values, val reflect.Value, scope string) error {
embedded = append(embedded, v)
continue
}
// a nil pointer to an embedded struct has no fields to promote
if sv.Kind() == reflect.Ptr && sv.IsNil() && sv.Type().Elem().Kind() == reflect.Struct {
continue
}
}

name = sf.Name
Expand Down
23 changes: 23 additions & 0 deletions query/encode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,29 @@ func TestValues_EmbeddedStructs(t *testing.T) {
OuterPtr{&Inner{V: "a"}},
url.Values{"V": {"a"}},
},
{
// nil embedded struct pointer has no fields to encode
OuterPtr{},
url.Values{},
},
{
struct {
*Inner
W string
}{W: "b"},
url.Values{"W": {"b"}},
},
{
struct{ N OuterPtr }{},
url.Values{},
},
{
// named embedded struct pointer is encoded like any nil pointer
struct {
*Inner `url:"inner"`
}{},
url.Values{"inner": {""}},
},
{
Mixed{Inner: Inner{V: "a"}, V: "b"},
url.Values{"V": {"b", "a"}},
Expand Down
Loading