golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/sql: escape EqualFold on Postgres (#2860)

Browse Source 
* adds tests for equalFold predicates

* ensure EqualFold escapes the argument on Postgres

* adds tests on builder as well
This commit is contained in:
Pedro Henrique
2022-08-16 04:09:06 -03:00
committed by GitHub
parent 4d11fe3383
commit 2b54aadcce
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dialect/sql/builder.go
View File

@@ -1703,14 +1703,17 @@ func (p *Predicate) EqualFold(col, sub string) *Predicate {
// We assume the CHARACTER SET is configured to utf8mb4,
// because this how it is defined in dialect/sql/schema.
b.Ident(col).WriteString(" COLLATE utf8mb4_general_ci = ")
b.Arg(strings.ToLower(sub))
case dialect.Postgres:
b.Ident(col).WriteString(" ILIKE ")
w, _ := escape(sub)
b.Arg(strings.ToLower(w))
default: // SQLite.
f.Lower(col)
b.WriteString(f.String())
b.WriteOp(OpEQ)
b.Arg(strings.ToLower(sub))
}
b.Arg(strings.ToLower(sub))
})
}

16
dialect/sql/builder_test.go
View File

@@ -1019,6 +1019,22 @@ func TestBuilder(t *testing.T) {
wantQuery: `SELECT * FROM "users" WHERE "name" ILIKE $1 OR "name" ILIKE $2`,
wantArgs: []interface{}{"bar", "baz"},
},
{
input: Dialect(dialect.Postgres).
Select().
From(Table("users")).
Where(Or(EqualFold("name", "BAR%"), EqualFold("name", "%BAZ"))),
wantQuery: `SELECT * FROM "users" WHERE "name" ILIKE $1 OR "name" ILIKE $2`,
wantArgs: []interface{}{"bar\\%", "\\%baz"},
},
{
input: Dialect(dialect.Postgres).
Select().
From(Table("users")).
Where(Or(EqualFold("name", "BAR\\"), EqualFold("name", "\\BAZ"))),
wantQuery: `SELECT * FROM "users" WHERE "name" ILIKE $1 OR "name" ILIKE $2`,
wantArgs: []interface{}{"bar\\\\", "\\\\baz"},
},
{
input: Dialect(dialect.MySQL).
Select().