From b1a98491f5719fdfe7ff9e96cc7a393b4a27a96e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 17 Jul 2021 21:56:42 +0800 Subject: [PATCH] refactor function name --- convert.go | 6 +++--- session.go | 2 +- session_insert.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/convert.go b/convert.go index 4ccf6064..7d30ec62 100644 --- a/convert.go +++ b/convert.go @@ -588,10 +588,10 @@ func convertAssign(dest, src interface{}, originalLocation *time.Location, conve 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 { return nil } @@ -605,7 +605,7 @@ func convertAssignV(dv reflect.Value, src interface{}, originalLocation, convert if dv.IsNil() { 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: i64, err := asInt64(src) if err != nil { diff --git a/session.go b/session.go index 809b2b24..806feed3 100644 --- a/session.go +++ b/session.go @@ -734,7 +734,7 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec } } // 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) { diff --git a/session_insert.go b/session_insert.go index aa3f135d..b41dbbac 100644 --- a/session_insert.go +++ b/session_insert.go @@ -375,7 +375,7 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) { 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 || session.engine.dialect.URI().DBType == schemas.MSSQL) { res, err := session.queryBytes(sqlStr, args...) @@ -415,7 +415,7 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) { 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...) @@ -455,7 +455,7 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) { 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 }