HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor function name

This commit is contained in:
Lunny Xiao 2021-07-17 21:56:42 +08:00
parent d508e86ddb
commit b1a98491f5
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
convert.go
View File

@ -588,10 +588,10 @@ func convertAssign(dest, src interface{}, originalLocation *time.Location, conve
return nil return nil
} }
return convertAssignV(reflect.ValueOf(dest), src, originalLocation, convertedLocation) return convertAssignV(reflect.ValueOf(dest), src)
} }
func convertAssignV(dv reflect.Value, src interface{}, originalLocation, convertedLocation *time.Location) error { func convertAssignV(dv reflect.Value, src interface{}) error {
if src == nil { if src == nil {
return nil return nil
} }
@ -605,7 +605,7 @@ func convertAssignV(dv reflect.Value, src interface{}, originalLocation, convert
if dv.IsNil() { if dv.IsNil() {
dv.Set(reflect.New(dv.Type().Elem())) dv.Set(reflect.New(dv.Type().Elem()))
} }
return convertAssignV(dv.Elem(), src, originalLocation, convertedLocation) return convertAssignV(dv.Elem(), src)
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
i64, err := asInt64(src) i64, err := asInt64(src)
if err != nil { if err != nil {

2
session.go
View File

@ -734,7 +734,7 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
} }
} // switch fieldType.Kind() } // switch fieldType.Kind()
return convertAssignV(fieldValue.Addr(), scanResult, session.engine.DatabaseTZ, session.engine.TZLocation) return convertAssignV(fieldValue.Addr(), scanResult)
} }
func (session *Session) slice2Bean(scanResults []interface{}, fields []string, bean interface{}, dataStruct *reflect.Value, table *schemas.Table) (schemas.PK, error) { func (session *Session) slice2Bean(scanResults []interface{}, fields []string, bean interface{}, dataStruct *reflect.Value, table *schemas.Table) (schemas.PK, error) {

6
session_insert.go
View File

@ -375,7 +375,7 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) {
return 1, nil return 1, nil
} }
return 1, convertAssignV(aiValue.Addr(), id, session.engine.DatabaseTZ, session.engine.TZLocation) return 1, convertAssignV(aiValue.Addr(), id)
} else if len(table.AutoIncrement) > 0 && (session.engine.dialect.URI().DBType == schemas.POSTGRES || } else if len(table.AutoIncrement) > 0 && (session.engine.dialect.URI().DBType == schemas.POSTGRES ||
session.engine.dialect.URI().DBType == schemas.MSSQL) { session.engine.dialect.URI().DBType == schemas.MSSQL) {
res, err := session.queryBytes(sqlStr, args...) res, err := session.queryBytes(sqlStr, args...)
@ -415,7 +415,7 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) {
return 1, nil return 1, nil
} }
return 1, convertAssignV(*aiValue, id, session.engine.DatabaseTZ, session.engine.TZLocation) return 1, convertAssignV(*aiValue, id)
} }
res, err := session.exec(sqlStr, args...) res, err := session.exec(sqlStr, args...)
@ -455,7 +455,7 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) {
return res.RowsAffected() return res.RowsAffected()
} }
if err := convertAssignV(*aiValue, id, session.engine.DatabaseTZ, session.engine.TZLocation); err != nil { if err := convertAssignV(*aiValue, id); err != nil {
return 0, err return 0, err
} }