summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/go-xorm/xorm/session.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/go-xorm/xorm/session.go')
-rw-r--r--vendor/github.com/go-xorm/xorm/session.go91
1 files changed, 26 insertions, 65 deletions
diff --git a/vendor/github.com/go-xorm/xorm/session.go b/vendor/github.com/go-xorm/xorm/session.go
index 6e1b02afb0..2efc74b285 100644
--- a/vendor/github.com/go-xorm/xorm/session.go
+++ b/vendor/github.com/go-xorm/xorm/session.go
@@ -386,52 +386,6 @@ func cleanupProcessorsClosures(slices *[]func(interface{})) {
}
}
-func (session *Session) scanMapIntoStruct(obj interface{}, objMap map[string][]byte) error {
- dataStruct := rValue(obj)
- if dataStruct.Kind() != reflect.Struct {
- return errors.New("Expected a pointer to a struct")
- }
-
- var col *core.Column
- session.Statement.setRefValue(dataStruct)
- table := session.Statement.RefTable
- tableName := session.Statement.tableName
-
- for key, data := range objMap {
- if col = table.GetColumn(key); col == nil {
- session.Engine.logger.Warnf("struct %v's has not field %v. %v",
- table.Type.Name(), key, table.ColumnsSeq())
- continue
- }
-
- fieldName := col.FieldName
- fieldPath := strings.Split(fieldName, ".")
- var fieldValue reflect.Value
- if len(fieldPath) > 2 {
- session.Engine.logger.Error("Unsupported mutliderive", fieldName)
- continue
- } else if len(fieldPath) == 2 {
- parentField := dataStruct.FieldByName(fieldPath[0])
- if parentField.IsValid() {
- fieldValue = parentField.FieldByName(fieldPath[1])
- }
- } else {
- fieldValue = dataStruct.FieldByName(fieldName)
- }
- if !fieldValue.IsValid() || !fieldValue.CanSet() {
- session.Engine.logger.Warnf("table %v's column %v is not valid or cannot set", tableName, key)
- continue
- }
-
- err := session.bytes2Value(col, &fieldValue, data)
- if err != nil {
- return err
- }
- }
-
- return nil
-}
-
func (session *Session) canCache() bool {
if session.Statement.RefTable == nil ||
session.Statement.JoinStr != "" ||
@@ -485,24 +439,28 @@ type Cell *interface{}
func (session *Session) rows2Beans(rows *core.Rows, fields []string, fieldsCount int,
table *core.Table, newElemFunc func() reflect.Value,
- sliceValueSetFunc func(*reflect.Value)) error {
+ sliceValueSetFunc func(*reflect.Value, core.PK) error) error {
for rows.Next() {
var newValue = newElemFunc()
bean := newValue.Interface()
dataStruct := rValue(bean)
- err := session._row2Bean(rows, fields, fieldsCount, bean, &dataStruct, table)
+ pk, err := session._row2Bean(rows, fields, fieldsCount, bean, &dataStruct, table)
+ if err != nil {
+ return err
+ }
+
+ err = sliceValueSetFunc(&newValue, pk)
if err != nil {
return err
}
- sliceValueSetFunc(&newValue)
}
return nil
}
-func (session *Session) row2Bean(rows *core.Rows, fields []string, fieldsCount int, bean interface{}) error {
+func (session *Session) row2Bean(rows *core.Rows, fields []string, fieldsCount int, bean interface{}) (core.PK, error) {
dataStruct := rValue(bean)
if dataStruct.Kind() != reflect.Struct {
- return errors.New("Expected a pointer to a struct")
+ return nil, errors.New("Expected a pointer to a struct")
}
session.Statement.setRefValue(dataStruct)
@@ -510,14 +468,14 @@ func (session *Session) row2Bean(rows *core.Rows, fields []string, fieldsCount i
return session._row2Bean(rows, fields, fieldsCount, bean, &dataStruct, session.Statement.RefTable)
}
-func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount int, bean interface{}, dataStruct *reflect.Value, table *core.Table) error {
+func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount int, bean interface{}, dataStruct *reflect.Value, table *core.Table) (core.PK, error) {
scanResults := make([]interface{}, fieldsCount)
for i := 0; i < len(fields); i++ {
var cell interface{}
scanResults[i] = &cell
}
if err := rows.Scan(scanResults...); err != nil {
- return err
+ return nil, err
}
if b, hasBeforeSet := bean.(BeforeSetProcessor); hasBeforeSet {
@@ -535,6 +493,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
}()
var tempMap = make(map[string]int)
+ var pk core.PK
for ii, key := range fields {
var idx int
var ok bool
@@ -579,10 +538,12 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
rawValueType := reflect.TypeOf(rawValue.Interface())
vv := reflect.ValueOf(rawValue.Interface())
-
+ col := table.GetColumnIdx(key, idx)
+ if col.IsPrimaryKey {
+ pk = append(pk, rawValue.Interface())
+ }
fieldType := fieldValue.Type()
hasAssigned := false
- col := table.GetColumnIdx(key, idx)
if col.SQLType.IsJson() {
var bs []byte
@@ -591,7 +552,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
} else if rawValueType.ConvertibleTo(core.BytesType) {
bs = vv.Bytes()
} else {
- return fmt.Errorf("unsupported database data type: %s %v", key, rawValueType.Kind())
+ return nil, fmt.Errorf("unsupported database data type: %s %v", key, rawValueType.Kind())
}
hasAssigned = true
@@ -601,14 +562,14 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
err := json.Unmarshal(bs, fieldValue.Addr().Interface())
if err != nil {
session.Engine.logger.Error(key, err)
- return err
+ return nil, err
}
} else {
x := reflect.New(fieldType)
err := json.Unmarshal(bs, x.Interface())
if err != nil {
session.Engine.logger.Error(key, err)
- return err
+ return nil, err
}
fieldValue.Set(x.Elem())
}
@@ -633,14 +594,14 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
err := json.Unmarshal(bs, fieldValue.Addr().Interface())
if err != nil {
session.Engine.logger.Error(err)
- return err
+ return nil, err
}
} else {
x := reflect.New(fieldType)
err := json.Unmarshal(bs, x.Interface())
if err != nil {
session.Engine.logger.Error(err)
- return err
+ return nil, err
}
fieldValue.Set(x.Elem())
}
@@ -772,7 +733,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
err := json.Unmarshal([]byte(vv.String()), x.Interface())
if err != nil {
session.Engine.logger.Error(err)
- return err
+ return nil, err
}
fieldValue.Set(x.Elem())
}
@@ -783,7 +744,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
err := json.Unmarshal(vv.Bytes(), x.Interface())
if err != nil {
session.Engine.logger.Error(err)
- return err
+ return nil, err
}
fieldValue.Set(x.Elem())
}
@@ -835,14 +796,14 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
defer newsession.Close()
has, err := newsession.Id(pk).NoCascade().Get(structInter.Interface())
if err != nil {
- return err
+ return nil, err
}
if has {
//v := structInter.Elem().Interface()
//fieldValue.Set(reflect.ValueOf(v))
fieldValue.Set(structInter.Elem())
} else {
- return errors.New("cascade obj is not exist")
+ return nil, errors.New("cascade obj is not exist")
}
}
} else {
@@ -982,7 +943,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
}
}
}
- return nil
+ return pk, nil
}
func (session *Session) queryPreprocess(sqlStr *string, paramStr ...interface{}) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-03 12:51:04 +0000