support params > 65535 for postgres.
This commit is contained in:
parent
55594d1dbe
commit
f5711b4552
|
@ -7,8 +7,10 @@ package integrations
|
|||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
"xorm.io/xorm/schemas"
|
||||
|
||||
"xorm.io/xorm"
|
||||
|
||||
|
@ -45,6 +47,26 @@ func TestInsertMulti(t *testing.T) {
|
|||
append([]TestMulti{}, TestMulti{1, "test1"}, TestMulti{2, "test2"}, TestMulti{3, "test3"}))
|
||||
assert.NoError(t, err)
|
||||
assert.EqualValues(t, 3, num)
|
||||
|
||||
if schemas.DBType(strings.ToLower(dbType)) == schemas.POSTGRES {
|
||||
type TestMultiPG struct {
|
||||
Id int64 `xorm:"int(11) pk"`
|
||||
Name string `xorm:"varchar(255)"`
|
||||
}
|
||||
assert.NoError(t, testEngine.Sync2(new(TestMultiPG)))
|
||||
|
||||
var data []TestMultiPG
|
||||
for i := 1; i < 655360; i++ {
|
||||
data = append(data, TestMultiPG{
|
||||
Id: int64(i),
|
||||
Name: fmt.Sprintf("test %d", i),
|
||||
})
|
||||
}
|
||||
|
||||
num, err := insertMultiDatas(655359, data)
|
||||
assert.NoError(t, err)
|
||||
assert.EqualValues(t, 655359, num)
|
||||
}
|
||||
}
|
||||
|
||||
func insertMultiDatas(step int, datas interface{}) (num int64, err error) {
|
||||
|
|
|
@ -19,6 +19,9 @@ import (
|
|||
// ErrNoElementsOnSlice represents an error there is no element when insert
|
||||
var ErrNoElementsOnSlice = errors.New("No element on slice when insert")
|
||||
|
||||
// maxPgParams pg only support max 65535 placeholder params
|
||||
const maxPgParams = 65535
|
||||
|
||||
// Insert insert one or more beans
|
||||
func (session *Session) Insert(beans ...interface{}) (int64, error) {
|
||||
var affected int64
|
||||
|
@ -114,14 +117,27 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
|
|||
var (
|
||||
table = session.statement.RefTable
|
||||
size = sliceValue.Len()
|
||||
colNames []string
|
||||
colMultiPlaces []string
|
||||
args []interface{}
|
||||
cols []*schemas.Column
|
||||
colNames []string
|
||||
step = size
|
||||
affectRows int64
|
||||
)
|
||||
|
||||
for i := 0; i < size; i++ {
|
||||
v := sliceValue.Index(i)
|
||||
if session.engine.dialect.URI().DBType == schemas.POSTGRES {
|
||||
step = maxPgParams / len(session.statement.RefTable.Columns())
|
||||
}
|
||||
|
||||
for i := 0; i < size; i += step {
|
||||
var colMultiPlaces []string
|
||||
var args []interface{}
|
||||
|
||||
stepSize := i + step
|
||||
if stepSize > size {
|
||||
stepSize = size
|
||||
}
|
||||
|
||||
for j := i; j < stepSize; j++ {
|
||||
v := sliceValue.Index(j)
|
||||
var vv reflect.Value
|
||||
switch v.Kind() {
|
||||
case reflect.Interface:
|
||||
|
@ -146,7 +162,7 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
|
|||
for _, col := range table.Columns() {
|
||||
ptrFieldValue, err := col.ValueOfV(&vv)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return affectRows, err
|
||||
}
|
||||
fieldValue := *ptrFieldValue
|
||||
if col.IsAutoIncrement && utils.IsZero(fieldValue.Interface()) {
|
||||
|
@ -183,12 +199,12 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
|
|||
} else {
|
||||
arg, err := session.statement.Value2Interface(col, fieldValue)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return affectRows, err
|
||||
}
|
||||
args = append(args, arg)
|
||||
}
|
||||
|
||||
if i == 0 {
|
||||
if j == 0 {
|
||||
colNames = append(colNames, col.Name)
|
||||
cols = append(cols, col)
|
||||
}
|
||||
|
@ -218,7 +234,16 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
|
|||
}
|
||||
res, err := session.exec(sql, args...)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return affectRows, err
|
||||
}
|
||||
af, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return affectRows, err
|
||||
}
|
||||
affectRows += af
|
||||
if stepSize == size {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
session.cacheInsert(tableName)
|
||||
|
@ -254,7 +279,7 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
|
|||
}
|
||||
|
||||
cleanupProcessorsClosures(&session.afterClosures)
|
||||
return res.RowsAffected()
|
||||
return affectRows, nil
|
||||
}
|
||||
|
||||
// InsertMulti insert multiple records
|
||||
|
|
Loading…
Reference in New Issue