Skip to content

Commit

Permalink
Fix: Where clauses with named arguments may cause generation of unint…
Browse files Browse the repository at this point in the history
…ended queries (#4937)
  • Loading branch information
emregullu committed Dec 21, 2021
1 parent 24026bf commit 2c3fc2d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
3 changes: 3 additions & 0 deletions clause/where.go
Expand Up @@ -60,6 +60,9 @@ func buildExprs(exprs []Expression, builder Builder, joinCond string) {
case Expr:
sql := strings.ToLower(v.SQL)
wrapInParentheses = strings.Contains(sql, "and") || strings.Contains(sql, "or")
case NamedExpr:
sql := strings.ToLower(v.SQL)
wrapInParentheses = strings.Contains(sql, "and") || strings.Contains(sql, "or")
}
}

Expand Down
13 changes: 13 additions & 0 deletions tests/named_argument_test.go
Expand Up @@ -2,6 +2,7 @@ package tests_test

import (
"database/sql"
"errors"
"testing"

"gorm.io/gorm"
Expand Down Expand Up @@ -66,4 +67,16 @@ func TestNamedArg(t *testing.T) {
}

AssertEqual(t, result6, namedUser)

var result7 NamedUser
if err := DB.Where("name1 = @name OR name2 = @name", sql.Named("name", "jinzhu-new")).Where("name3 = 'jinzhu-new3'").First(&result7).Error; err == nil || !errors.Is(err, gorm.ErrRecordNotFound) {
t.Errorf("should return record not found error, but got %v", err)
}

DB.Delete(&namedUser)

var result8 NamedUser
if err := DB.Where("name1 = @name OR name2 = @name", map[string]interface{}{"name": "jinzhu-new"}).First(&result8).Error; err == nil || !errors.Is(err, gorm.ErrRecordNotFound) {
t.Errorf("should return record not found error, but got %v", err)
}
}

0 comments on commit 2c3fc2d

Please sign in to comment.