go/go-sqlmock
1
0
Fork 0
mirror of https://github.com/DATA-DOG/go-sqlmock.git synced 2025-03-17 20:48:01 +02:00
Code Issues Releases Activity

Merge pull request #333 from sfc-gh-tvidyasankar/patch-1

Browse Source 
fix bug/334 when checking empty expectedQuery with actual query
This commit is contained in:
Gediminas Morkevicius 2024-04-03 14:17:47 +03:00 committed by GitHub
commit 662222463e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
query.go
View File

@ -45,6 +45,9 @@ func (f QueryMatcherFunc) Match(expectedSQL, actualSQL string) error {
var QueryMatcherRegexp QueryMatcher = QueryMatcherFunc(func(expectedSQL, actualSQL string) error { var QueryMatcherRegexp QueryMatcher = QueryMatcherFunc(func(expectedSQL, actualSQL string) error {
expect := stripQuery(expectedSQL) expect := stripQuery(expectedSQL)
actual := stripQuery(actualSQL) actual := stripQuery(actualSQL)
if actual != "" && expect == "" {
return fmt.Errorf("expectedSQL can't be empty")
}
re, err := regexp.Compile(expect) re, err := regexp.Compile(expect)
if err != nil { if err != nil {
return err return err

1
query_test.go
View File

@ -69,6 +69,7 @@ func TestQueryMatcherRegexp(t *testing.T) {
{"SELECT (.+) FROM users", "SELECT name, email FROM users WHERE id = ?", nil}, {"SELECT (.+) FROM users", "SELECT name, email FROM users WHERE id = ?", nil},
{"Select (.+) FROM users", "SELECT name, email FROM users WHERE id = ?", fmt.Errorf(`could not match actual sql: "SELECT name, email FROM users WHERE id = ?" with expected regexp "Select (.+) FROM users"`)}, {"Select (.+) FROM users", "SELECT name, email FROM users WHERE id = ?", fmt.Errorf(`could not match actual sql: "SELECT name, email FROM users WHERE id = ?" with expected regexp "Select (.+) FROM users"`)},
{"SELECT (.+) FROM\nusers", "SELECT name, email\n FROM users\n WHERE id = ?", nil}, {"SELECT (.+) FROM\nusers", "SELECT name, email\n FROM users\n WHERE id = ?", nil},
{"","SELECT from table", fmt.Errorf(`expectedSQL can't be empty`)},
} }
for i, c := range cases { for i, c := range cases {