fix issue #2561 #2431

contrib/drivers/mssql/mssql.go

@@ -20,6 +20,7 @@ import (
  "strings"
 
  _ "github.com/denisenkom/go-mssqldb"
+
  "github.com/gogf/gf/v2/database/gdb"
  "github.com/gogf/gf/v2/errors/gcode"
  "github.com/gogf/gf/v2/errors/gerror"
@@ -285,7 +286,6 @@ ORDER BY a.id,a.colorder`,
  }
  fields = make(map[string]*gdb.TableField)
  for i, m := range result {
-
  fields[m["Field"].String()] = &gdb.TableField{
  Index: i,
  Name: m["Field"].String(),

contrib/drivers/mysql/mysql_issue_test.go

@@ -664,3 +664,65 @@ CREATE TABLE %s (
  t.AssertNil(err3)
  })
 }
+
+// https:/gogf/gf/issues/2561
+func Test_Issue2561(t *testing.T) {
+ table := createTable()
+ defer dropTable(table)
+
+ gtest.C(t, func(t *gtest.T) {
+ type User struct {
+ g.Meta `orm:"do:true"`
+ Id interface{}
+ Passport interface{}
+ Password interface{}
+ Nickname interface{}
+ CreateTime interface{}
+ }
+ data := g.Slice{
+ User{
+ Id: 1,
+ Passport: "user_1",
+ },
+ User{
+ Id: 2,
+ Password: "pass_2",
+ },
+ User{
+ Id: 3,
+ Password: "pass_3",
+ },
+ }
+ result, err := db.Model(table).Data(data).Insert()
+ t.AssertNil(err)
+ m, _ := result.LastInsertId()
+ t.Assert(m, 3)
+
+ n, _ := result.LastInsertId()
+ t.Assert(n, 3)
+
+ one, err := db.Model(table).WherePri(1).One()
+ t.AssertNil(err)
+ t.Assert(one[`id`], `1`)
+ t.Assert(one[`passport`], `user_1`)
+ t.Assert(one[`password`], ``)
+ t.Assert(one[`nickname`], ``)
+ t.Assert(one[`create_time`], ``)
+
+ one, err = db.Model(table).WherePri(2).One()
+ t.AssertNil(err)
+ t.Assert(one[`id`], `2`)
+ t.Assert(one[`passport`], ``)
+ t.Assert(one[`password`], `pass_2`)
+ t.Assert(one[`nickname`], ``)
+ t.Assert(one[`create_time`], ``)
+
+ one, err = db.Model(table).WherePri(3).One()
+ t.AssertNil(err)
+ t.Assert(one[`id`], `3`)
+ t.Assert(one[`passport`], ``)
+ t.Assert(one[`password`], `pass_3`)
+ t.Assert(one[`nickname`], ``)
+ t.Assert(one[`create_time`], ``)
+ })
+}

database/gdb/gdb_core.go

@@ -14,6 +14,7 @@ import (
  "reflect"
  "strings"
 
+ "github.com/gogf/gf/v2/container/gset"
  "github.com/gogf/gf/v2/container/gvar"
  "github.com/gogf/gf/v2/errors/gcode"
  "github.com/gogf/gf/v2/errors/gerror"
@@ -389,6 +390,29 @@ func (c *Core) Save(ctx context.Context, table string, data interface{}, batch .
  return c.Model(table).Ctx(ctx).Data(data).Save()
 }
 
+func (c *Core) fieldsToSequence(ctx context.Context, table string, fields []string) ([]string, error) {
+ var (
+ fieldSet = gset.NewStrSetFrom(fields)
+ fieldsResultInSequence = make([]string, 0)
+ tableFields, err = c.db.TableFields(ctx, table)
+ )
+ if err != nil {
+ return nil, err
+ }
+ // Sort the fields in order.
+ var fieldsOfTableInSequence = make([]string, len(tableFields))
+ for _, field := range tableFields {
+ fieldsOfTableInSequence[field.Index] = field.Name
+ }
+ // Sort the input fields.
+ for _, fieldName := range fieldsOfTableInSequence {
+ if fieldSet.Contains(fieldName) {
+ fieldsResultInSequence = append(fieldsResultInSequence, fieldName)
+ }
+ }
+ return fieldsResultInSequence, nil
+}
+
 // DoInsert inserts or updates data forF given table.
 // This function is usually used for custom interface definition, you do not need call it manually.
 // The parameter `data` can be type of map/gmap/struct/*struct/[]map/[]struct, etc.
@@ -408,9 +432,46 @@ func (c *Core) DoInsert(ctx context.Context, link Link, table string, list List,
  params []interface{} // Values that will be committed to underlying database driver.
  onDuplicateStr string // onDuplicateStr is used in "ON DUPLICATE KEY UPDATE" statement.
  )
- // Handle the field names and placeholders.
- for k := range list[0] {
- keys = append(keys, k)
+ // Group the list by fields.
+ // Different fields to different list.
+ var keyListMap = make(map[string]List)
+ for _, item := range list {
+ var (
+ tmpKeys = make([]string, 0)
+ tmpKeysInSequenceStr string
+ )
+ for k := range item {
+ tmpKeys = append(tmpKeys, k)
+ }
+ keys, err = c.fieldsToSequence(ctx, table, tmpKeys)
+ if err != nil {
+ return nil, err
+ }
+ tmpKeysInSequenceStr = gstr.Join(keys, ",")
+ if keyListMap[tmpKeysInSequenceStr] == nil {
+ keyListMap[tmpKeysInSequenceStr] = make(List, 0)
+ }
+ keyListMap[tmpKeysInSequenceStr] = append(keyListMap[tmpKeysInSequenceStr], item)
+ }
+ if len(keyListMap) > 1 {
+ var (
+ tmpResult sql.Result
+ sqlResult SqlResult
+ rowsAffected int64
+ )
+ for _, v := range keyListMap {
+ tmpResult, err = c.DoInsert(ctx, link, table, v, option)
+ if err != nil {
+ return nil, err
+ }
+ rowsAffected, err = tmpResult.RowsAffected()
+ if err != nil {
+ return nil, err
+ }
+ sqlResult.Result = tmpResult
+ sqlResult.Affected += rowsAffected
+ }
+ return &sqlResult, nil
  }
  // Prepare the batch result pointer.
  var (
@@ -571,7 +632,20 @@ func (c *Core) DoUpdate(ctx context.Context, link Link, table string, data inter
  if err != nil {
  return nil, err
  }
- for k, v := range dataMap {
+ // Sort the data keys in sequence of table fields.
+ var (
+ dataKeys = make([]string, 0)
+ keysInSequence = make([]string, 0)
+ )
+ for k := range dataMap {
+ dataKeys = append(dataKeys, k)
+ }
+ keysInSequence, err = c.fieldsToSequence(ctx, table, dataKeys)
+ if err != nil {
+ return nil, err
+ }
+ for _, k := range keysInSequence {
+ v := dataMap[k]
  switch value := v.(type) {
  case *Counter:
  counterHandler(k, *value)