Skip to content

Commit 2b7b86b

Browse files
authored
Merge pull request #54 from hori-ryota/fix-nested-prefix-order
fix: nexted prefix order with inline
2 parents 7c7652d + 2d01862 commit 2b7b86b

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func buildFields(k typeKey) fields {
121121
continue
122122
}
123123
if f.tag.prefix != "" {
124-
tag.prefix += f.tag.prefix
124+
tag.prefix = f.tag.prefix + tag.prefix
125125
}
126126

127127
ft := sf.Type

example_encoder_test.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,14 @@ func ExampleEncoder_EncodeHeader() {
116116
}
117117

118118
func ExampleEncoder_Encode_inline() {
119+
type Owner struct {
120+
Name string `csv:"name"`
121+
}
122+
119123
type Address struct {
120124
Street string `csv:"street"`
121125
City string `csv:"city"`
126+
Owner Owner `csv:"owner_,inline"`
122127
}
123128

124129
type User struct {
@@ -132,9 +137,9 @@ func ExampleEncoder_Encode_inline() {
132137
users := []User{
133138
{
134139
Name: "John",
135-
Address: Address{"Washington", "Boston"},
136-
HomeAddress: Address{"Boylston", "Boston"},
137-
WorkAddress: Address{"River St", "Cambridge"},
140+
Address: Address{"Washington", "Boston", Owner{"Steve"}},
141+
HomeAddress: Address{"Boylston", "Boston", Owner{"Steve"}},
142+
WorkAddress: Address{"River St", "Cambridge", Owner{"Steve"}},
138143
Age: 26,
139144
},
140145
}
@@ -147,8 +152,8 @@ func ExampleEncoder_Encode_inline() {
147152
fmt.Printf("%s\n", b)
148153

149154
// Output:
150-
// name,street,city,home_address_street,home_address_city,work_address_street,work_address_city,age
151-
// John,Washington,Boston,Boylston,Boston,River St,Cambridge,26
155+
// name,street,city,owner_name,home_address_street,home_address_city,home_address_owner_name,work_address_street,work_address_city,work_address_owner_name,age
156+
// John,Washington,Boston,Steve,Boylston,Boston,Steve,River St,Cambridge,Steve,26
152157
}
153158

154159
func ExampleEncoder_Register() {

0 commit comments

Comments
 (0)