tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Escape query string and assert err == nil

Browse Source
This commit is contained in:
Ian Tan 2017-11-18 19:24:45 +08:00
parent ae219db84b
commit 6a1b81b18b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
expecter.go
View File

@ -4,6 +4,7 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"fmt" "fmt"
"regexp"
) )
type Recorder struct { type Recorder struct {
@ -116,8 +117,8 @@ func (h *Expecter) AssertExpectations() error {
// First triggers a Query // First triggers a Query
func (h *Expecter) First(out interface{}, where ...interface{}) ExpectedQuery { func (h *Expecter) First(out interface{}, where ...interface{}) ExpectedQuery {
h.gorm.First(out, where) h.gorm.First(out)
return h.adapter.ExpectQuery(h.recorder.stmt) return h.adapter.ExpectQuery(regexp.QuoteMeta(h.recorder.stmt))
} }
// Find triggers a Query // Find triggers a Query

5
expecter_test.go
View File

@ -39,8 +39,9 @@ func TestQuery(t *testing.T) {
} }
expect.First(&User{}) expect.First(&User{})
db.First(&User{}) db.First(&User{})
expect.AssertExpectations() if err := expect.AssertExpectations(); err != nil {
t.Error(err)
}
} }