server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug:reflect.ValueOf(nil) in getFlatParams

Browse Source
This commit is contained in:
jianzhiyao 2021-08-05 10:42:54 +08:00
parent bb598b28cd
commit 0f40824f57
2 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/orm/db_utils.go
View File

@ -57,13 +57,12 @@ func getExistPk(mi *modelInfo, ind reflect.Value) (column string, value interfac
func getFlatParams(fi *fieldInfo, args []interface{}, tz *time.Location) (params []interface{}) { func getFlatParams(fi *fieldInfo, args []interface{}, tz *time.Location) (params []interface{}) {
outFor: outFor:
for _, arg := range args { for _, arg := range args {
val := reflect.ValueOf(arg)
if arg == nil { if arg == nil {
params = append(params, arg) params = append(params, arg)
continue continue
} }
val := reflect.ValueOf(arg)
kind := val.Kind() kind := val.Kind()
if kind == reflect.Ptr { if kind == reflect.Ptr {
val = val.Elem() val = val.Elem()

73
client/orm/orm_test.go
View File

@ -2055,68 +2055,79 @@ func TestRawValues(t *testing.T) {
} }
func TestRawPrepare(t *testing.T) { func TestRawPrepare(t *testing.T) {
var (
result sql.Result
err error
pre RawPreparer
)
switch { switch {
case IsMysql || IsSqlite: case IsMysql || IsSqlite:
pre, err := dORM.Raw("INSERT INTO tag (name) VALUES (?)").Prepare() pre, err = dORM.Raw("INSERT INTO tag (name) VALUES (?)").Prepare()
throwFail(t, err) assert.Nil(t, err)
if pre != nil { if pre != nil {
r, err := pre.Exec("name1") result, err = pre.Exec(nil)
throwFail(t, err) assert.Nil(t, err)
tid, err := r.LastInsertId() result, err = pre.Exec("name1")
throwFail(t, err) assert.Nil(t, err)
throwFail(t, AssertIs(tid > 0, true))
r, err = pre.Exec("name2") tid, err := result.LastInsertId()
throwFail(t, err) assert.Nil(t, err)
assert.True(t, tid > 0)
id, err := r.LastInsertId() result, err = pre.Exec("name2")
throwFail(t, err) assert.Nil(t, err)
throwFail(t, AssertIs(id, tid+1))
r, err = pre.Exec("name3") id, err := result.LastInsertId()
throwFail(t, err) assert.Nil(t, err)
assert.Equal(t, id, tid+1)
id, err = r.LastInsertId() result, err = pre.Exec("name3")
throwFail(t, err) assert.Nil(t, err)
throwFail(t, AssertIs(id, tid+2))
id, err = result.LastInsertId()
assert.Nil(t, err)
assert.Equal(t, id, tid+2)
err = pre.Close() err = pre.Close()
throwFail(t, err) assert.Nil(t, err)
res, err := dORM.Raw("DELETE FROM tag WHERE name IN (?, ?, ?)", []string{"name1", "name2", "name3"}).Exec() res, err := dORM.Raw("DELETE FROM tag WHERE name IN (?, ?, ?)", []string{"name1", "name2", "name3"}).Exec()
throwFail(t, err) assert.Nil(t, err)
num, err := res.RowsAffected() num, err := res.RowsAffected()
throwFail(t, err) assert.Nil(t, err)
throwFail(t, AssertIs(num, 3)) assert.Equal(t, num, 3)
} }
case IsPostgres: case IsPostgres:
pre, err := dORM.Raw(`INSERT INTO "tag" ("name") VALUES (?) RETURNING "id"`).Prepare() pre, err = dORM.Raw(`INSERT INTO "tag" ("name") VALUES (?) RETURNING "id"`).Prepare()
throwFail(t, err) assert.Nil(t, err)
if pre != nil { if pre != nil {
_, err := pre.Exec("name1") _, err = pre.Exec(nil)
throwFail(t, err) assert.Nil(t, err)
_, err = pre.Exec("name1")
assert.Nil(t, err)
_, err = pre.Exec("name2") _, err = pre.Exec("name2")
throwFail(t, err) assert.Nil(t, err)
_, err = pre.Exec("name3") _, err = pre.Exec("name3")
throwFail(t, err) assert.Nil(t, err)
err = pre.Close() err = pre.Close()
throwFail(t, err) assert.Nil(t, err)
res, err := dORM.Raw(`DELETE FROM "tag" WHERE "name" IN (?, ?, ?)`, []string{"name1", "name2", "name3"}).Exec() res, err := dORM.Raw(`DELETE FROM "tag" WHERE "name" IN (?, ?, ?)`, []string{"name1", "name2", "name3"}).Exec()
throwFail(t, err) assert.Nil(t, err)
if err == nil { if err == nil {
num, err := res.RowsAffected() num, err := res.RowsAffected()
throwFail(t, err) assert.Nil(t, err)
throwFail(t, AssertIs(num, 3)) assert.Equal(t, num, 3)
} }
} }
} }