Merge pull request #2583 from OlegFX/develop

Fixed InsertOrUpdate bug

Merge pull request #2583 from OlegFX/develop
Fixed InsertOrUpdate bug
3bb4ca5a · astaxie · GitHub · 45369172 · 712df81c · 3bb4ca5a
Commit 3bb4ca5a authored Apr 22, 2017 by astaxie Committed by GitHub Apr 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

db.go orm/db.go +1 -1

No files found.
--- 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