Merge pull request #2583 from OlegFX/develop

Fixed InsertOrUpdate bug
2017-04-22 11:19:15 +08:00 · 2017-04-22 11:19:15 +08:00 · 3bb4ca5adc
parent 453691728a 712df81c99
commit 3bb4ca5adc
1 changed files with 1 additions and 1 deletions
--- a/orm/db.go
+++ b/orm/db.go
@ -592,7 +592,7 @@ func (d *dbBase) InsertOrUpdate(q dbQuerier, mi *modelInfo, ind reflect.Value, a
 	row := q.QueryRow(query, values...)
 	var id int64
 	err = row.Scan(&id)
-	if err.Error() == `pq: syntax error at or near "ON"` {
+	if err != nil && err.Error() == `pq: syntax error at or near "ON"` {
 		err = fmt.Errorf("postgres version must 9.5 or higher")
 	}
 	return id, err