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

dialect/sql: add json-eq op for predicates (#728)

Browse Source
This commit is contained in:
Ariel Mashraki
2020-09-05 20:21:13 +03:00
committed by GitHub
parent 6a1829cc33
commit e4767ed83e
2 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
dialect/sql/builder.go
View File

@@ -897,21 +897,6 @@ func (p *Predicate) EQ(col string, arg interface{}) *Predicate {
})
}
// JSONHasKey calls Predicate.JSONHasKey.
func JSONHasKey(col string, path string) *Predicate {
return P().JSONHasKey(col, path)
}
// JSONHasKey return a predicate for checking that a JSON key exists and not NULL.
//
// P().JSONHasKey("column", "a.b[2].c")
//
func (p *Predicate) JSONHasKey(col string, path string) *Predicate {
return p.Append(func(b *Builder) {
b.JSONPath(col, DotPath(path)).WriteOp(OpNotNull)
})
}
// NEQ returns a "<>" predicate.
func NEQ(col string, value interface{}) *Predicate {
return P().NEQ(col, value)
@@ -982,6 +967,37 @@ func (p *Predicate) GTE(col string, arg interface{}) *Predicate {
})
}
// JSONHasKey calls Predicate.JSONHasKey.
func JSONHasKey(col, path string) *Predicate {
return P().JSONHasKey(col, path)
}
// JSONHasKey return a predicate for checking that a JSON key exists and not NULL.
//
// P().JSONHasKey("column", "a.b[2].c")
//
func (p *Predicate) JSONHasKey(col, path string) *Predicate {
return p.Append(func(b *Builder) {
b.JSONPath(col, DotPath(path)).WriteOp(OpNotNull)
})
}
// JSONValueEQ calls Predicate.JSONValueEQ.
func JSONValueEQ(col, path string, arg interface{}) *Predicate {
return P().JSONValueEQ(col, path, arg)
}
// JSONValueEQ return a predicate for checking that a JSON
// value (returned by the path) is equal to the given argument.
//
// P().JSONValueEQ("column", "a.b[2].c", arg)
//
func (p *Predicate) JSONValueEQ(col, path string, arg interface{}) *Predicate {
return p.Append(func(b *Builder) {
b.JSONPath(col, DotPath(path)).WriteOp(OpEQ).Arg(arg)
})
}
// NotNull returns the `IS NOT NULL` predicate.
func NotNull(col string) *Predicate {
return P().NotNull(col)

47
dialect/sql/builder_test.go
View File

@@ -1269,26 +1269,6 @@ WHERE
wantQuery: `SELECT * FROM "test" WHERE nlevel("path") > $1`,
wantArgs: []interface{}{1},
},
{
input: Select("*").
From(Table("test")).
Where(JSONHasKey("j", "a.*.c")),
wantQuery: "SELECT * FROM `test` WHERE JSON_EXTRACT(`j`, \"$.a.*.c\") IS NOT NULL",
},
{
input: Dialect(dialect.Postgres).
Select("*").
From(Table("test")).
Where(JSONHasKey("j", "a.b.c")),
wantQuery: `SELECT * FROM "test" WHERE "j"->'a'->'b'->'c' IS NOT NULL`,
},
{
input: Dialect(dialect.Postgres).
Select("*").
From(Table("test")).
Where(JSONHasKey("j", "a.b.c")),
wantQuery: `SELECT * FROM "test" WHERE "j"->'a'->'b'->'c' IS NOT NULL`,
},
{
input: Dialect(dialect.Postgres).
Select("*").
@@ -1325,6 +1305,33 @@ WHERE
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, \"$.b.\"c[1]\".d[1][2].e\") = ?",
wantArgs: []interface{}{"a"},
},
{
input: Select("*").
From(Table("test")).
Where(JSONHasKey("j", "a.*.c")),
wantQuery: "SELECT * FROM `test` WHERE JSON_EXTRACT(`j`, \"$.a.*.c\") IS NOT NULL",
},
{
input: Dialect(dialect.Postgres).
Select("*").
From(Table("test")).
Where(JSONHasKey("j", "a.b.c")),
wantQuery: `SELECT * FROM "test" WHERE "j"->'a'->'b'->'c' IS NOT NULL`,
},
{
input: Dialect(dialect.Postgres).
Select("*").
From(Table("test")).
Where(JSONHasKey("j", "a.b.c")),
wantQuery: `SELECT * FROM "test" WHERE "j"->'a'->'b'->'c' IS NOT NULL`,
},
{
input: Select("*").
From(Table("test")).
Where(JSONValueEQ("j", "a.b.c", 1)),
wantQuery: "SELECT * FROM `test` WHERE JSON_EXTRACT(`j`, \"$.a.b.c\") = ?",
wantArgs: []interface{}{1},
},
}
for i, tt := range tests {
t.Run(strconv.Itoa(i), func(t *testing.T) {