1
0
mirror of https://github.com/astaxie/beego.git synced 2024-06-02 10:43:29 +00:00

Merge pull request #4210 from flycash/adt/all

Move pr 3784
This commit is contained in:
Ming Deng 2020-09-07 20:53:45 +08:00 committed by GitHub
commit b86cf22fc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -330,6 +330,8 @@ func (o *rawSet) QueryRow(containers ...interface{}) error {
return err return err
} }
structTagMap := make(map[reflect.StructTag]map[string]string)
defer rows.Close() defer rows.Close()
if rows.Next() { if rows.Next() {
@ -396,7 +398,12 @@ func (o *rawSet) QueryRow(containers ...interface{}) error {
recursiveSetField(f) recursiveSetField(f)
} }
_, tags := parseStructTag(fe.Tag.Get(defaultStructTagName)) // thanks @Gazeboxu.
tags := structTagMap[fe.Tag]
if tags == nil {
_, tags = parseStructTag(fe.Tag.Get(defaultStructTagName))
structTagMap[fe.Tag] = tags
}
var col string var col string
if col = tags["column"]; col == "" { if col = tags["column"]; col == "" {
col = nameStrategyMap[nameStrategy](fe.Name) col = nameStrategyMap[nameStrategy](fe.Name)