lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 22:00:55 +00:00
Code Issues Releases Activity

fix unquoted identifier that may be misleading in postgres

Browse Source 
Signed-off-by: Penghui Liao <liaoishere@gmail.com>
This commit is contained in:
Penghui Liao 2018-05-04 16:15:50 +08:00
parent c9b6e4f825
commit 0dff771707
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orm/db.go
View File

@ -536,6 +536,8 @@ func (d *dbBase) InsertOrUpdate(q dbQuerier, mi *modelInfo, ind reflect.Value, a
updates := make([]string, len(names)) updates := make([]string, len(names))
var conflitValue interface{} var conflitValue interface{}
for i, v := range names { for i, v := range names {
// identifier in database may not be case-sensitive, so quote it
v = fmt.Sprintf("%s%s%s", Q, v, Q)
marks[i] = "?" marks[i] = "?"
valueStr := argsMap[strings.ToLower(v)] valueStr := argsMap[strings.ToLower(v)]
if v == args0 { if v == args0 {

4
orm/models_test.go
View File

@ -477,9 +477,7 @@ go test -v github.com/astaxie/beego/orm
#### TiDB #### TiDB
export ORM_DRIVER=tidb export ORM_DRIVER=tidb
export ORM_SOURCE='memory://test/test' export ORM_SOURCE='memory://test/test'
go test -v github.com/astaxie/beego/orm go test -v github.com/astaxie/beego/orm`)
`)
os.Exit(2) os.Exit(2)
} }

5
orm/orm_test.go
View File

@ -2297,6 +2297,11 @@ func TestInsertOrUpdate(t *testing.T) {
throwFailNow(t, AssertIs(user2.Status, test.Status)) throwFailNow(t, AssertIs(user2.Status, test.Status))
throwFailNow(t, AssertIs(user2.Password, strings.TrimSpace(test.Password))) throwFailNow(t, AssertIs(user2.Password, strings.TrimSpace(test.Password)))
} }
//postgres ON CONFLICT DO UPDATE SET can`t use colu=colu+values
if IsPostgres {
return
}
//test3 + //test3 +
_, err = dORM.InsertOrUpdate(&user2, "user_name", "status=status+1") _, err = dORM.InsertOrUpdate(&user2, "user_name", "status=status+1")
if err != nil { if err != nil {