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

Merge pull request #4715 from jianzhiyao/develop

Browse Source 
fix bug:reflect.ValueOf(nil) in getFlatParams
This commit is contained in:
Ming Deng 2021-08-06 00:26:54 +08:00 committed by GitHub
commit 0ace49bd46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -55,6 +55,7 @@
- Deprecated BeeMap and replace all usage with `sync.map` [4616](https://github.com/beego/beego/pull/4616)
- TaskManager support graceful shutdown [4635](https://github.com/beego/beego/pull/4635)
- Add comments to `web.Config`, rename `RouterXXX` to `CtrlXXX`, define `HandleFunc` [4714](https://github.com/beego/beego/pull/4714)
- fix bug:reflect.ValueOf(nil) in getFlatParams [4715](https://github.com/beego/beego/pull/4715)
## Fix Sonar

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{}) {
outFor:
for _, arg := range args {
val := reflect.ValueOf(arg)
if arg == nil {
params = append(params, arg)
continue
}
val := reflect.ValueOf(arg)
kind := val.Kind()
if kind == reflect.Ptr {
val = val.Elem()

5
client/orm/models_test.go
View File

@ -348,6 +348,11 @@ func NewPost() *Post {
return obj
}
type NullValue struct {
ID int `orm:"column(id)"`
Value string `orm:"size(30);null"`
}
type Tag struct {
ID int `orm:"column(id)"`
Name string `orm:"size(30)"`

76
client/orm/orm_test.go
View File

@ -188,6 +188,7 @@ func TestSyncDb(t *testing.T) {
RegisterModel(new(User))
RegisterModel(new(Profile))
RegisterModel(new(Post))
RegisterModel(new(NullValue))
RegisterModel(new(Tag))
RegisterModel(new(Comment))
RegisterModel(new(UserBig))
@ -216,6 +217,7 @@ func TestRegisterModels(t *testing.T) {
RegisterModel(new(User))
RegisterModel(new(Profile))
RegisterModel(new(Post))
RegisterModel(new(NullValue))
RegisterModel(new(Tag))
RegisterModel(new(Comment))
RegisterModel(new(UserBig))
@ -2054,69 +2056,81 @@ func TestRawValues(t *testing.T) {
}
}
func TestForIssue4709(t *testing.T) {
pre, err := dORM.Raw("INSERT into null_value (value) VALUES (?)").Prepare()
assert.Nil(t, err)
_, err = pre.Exec(nil)
assert.Nil(t, err)
}
func TestRawPrepare(t *testing.T) {
var (
result sql.Result
err error
pre RawPreparer
)
switch {
case IsMysql || IsSqlite:
pre, err := dORM.Raw("INSERT INTO tag (name) VALUES (?)").Prepare()
throwFail(t, err)
pre, err = dORM.Raw("INSERT INTO tag (name) VALUES (?)").Prepare()
assert.Nil(t, err)
if pre != nil {
r, err := pre.Exec("name1")
throwFail(t, err)
result, err = pre.Exec("name1")
assert.Nil(t, err)
tid, err := r.LastInsertId()
throwFail(t, err)
throwFail(t, AssertIs(tid > 0, true))
tid, err := result.LastInsertId()
assert.Nil(t, err)
assert.True(t, tid > 0)
r, err = pre.Exec("name2")
throwFail(t, err)
result, err = pre.Exec("name2")
assert.Nil(t, err)
id, err := r.LastInsertId()
throwFail(t, err)
throwFail(t, AssertIs(id, tid+1))
id, err := result.LastInsertId()
assert.Nil(t, err)
assert.Equal(t, id, tid+1)
r, err = pre.Exec("name3")
throwFail(t, err)
result, err = pre.Exec("name3")
assert.Nil(t, err)
id, err = r.LastInsertId()
throwFail(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()
throwFail(t, err)
assert.Nil(t, err)
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()
throwFail(t, err)
throwFail(t, AssertIs(num, 3))
assert.Nil(t, err)
assert.Equal(t, num, int64(3))
}
case IsPostgres:
pre, err := dORM.Raw(`INSERT INTO "tag" ("name") VALUES (?) RETURNING "id"`).Prepare()
throwFail(t, err)
pre, err = dORM.Raw(`INSERT INTO "tag" ("name") VALUES (?) RETURNING "id"`).Prepare()
assert.Nil(t, err)
if pre != nil {
_, err := pre.Exec("name1")
throwFail(t, err)
_, err = pre.Exec("name1")
assert.Nil(t, err)
_, err = pre.Exec("name2")
throwFail(t, err)
assert.Nil(t, err)
_, err = pre.Exec("name3")
throwFail(t, err)
assert.Nil(t, err)
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()
throwFail(t, err)
assert.Nil(t, err)
if err == nil {
num, err := res.RowsAffected()
throwFail(t, err)
throwFail(t, AssertIs(num, 3))
assert.Nil(t, err)
assert.Equal(t, num, int64(3))
}
}
}