golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-04-28 21:50:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/sql/sqljson: quote non-identifiers (#2910)

Browse Source 
* dialect/sql: fixed invalid json path quote

* fix: fixed empty string

* fix: fixed lint issue

* Apply suggestions from code review

Co-authored-by: Ariel Mashraki <7413593+a8m@users.noreply.github.com>

* fix: added test to new case

Co-authored-by: Ariel Mashraki <7413593+a8m@users.noreply.github.com>
This commit is contained in:
Giau. Tran Minh
2022-09-07 18:49:11 +07:00
committed by GitHub
parent 1773fc465e
commit 2cdb627c0d
2 changed files with 58 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
dialect/sql/sqljson/sqljson_test.go
View File

@@ -33,7 +33,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueEQ("a", "a", sqljson.DotPath("b.c[1].d"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, \"$.b.c[1].d\") = ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, '$.b.c[1].d') = ?",
wantArgs: []any{"a"},
},
{
@@ -41,34 +41,34 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueEQ("a", "a", sqljson.DotPath("b.\"c[1]\".d[1][2].e"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, \"$.b.\"c[1]\".d[1][2].e\") = ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, '$.b.\"c[1]\".d[1][2].e') = ?",
wantArgs: []any{"a"},
},
{
input: sql.Select("*").
From(sql.Table("test")).
Where(sqljson.HasKey("j", sqljson.DotPath("a.*.c"))),
wantQuery: "SELECT * FROM `test` WHERE JSON_EXTRACT(`j`, \"$.a.*.c\") IS NOT NULL",
wantQuery: "SELECT * FROM `test` WHERE JSON_EXTRACT(`j`, '$.a.*.c') IS NOT NULL",
},
{
input: sql.Select("*").
From(sql.Table("test")).
Where(sqljson.HasKey("j", sqljson.DotPath("a.*.c"))),
wantQuery: "SELECT * FROM `test` WHERE JSON_EXTRACT(`j`, \"$.a.*.c\") IS NOT NULL",
wantQuery: "SELECT * FROM `test` WHERE JSON_EXTRACT(`j`, '$.a.*.c') IS NOT NULL",
},
{
input: sql.Dialect(dialect.SQLite).
Select("*").
From(sql.Table("test")).
Where(sqljson.HasKey("j", sqljson.DotPath("attributes[1].body"))),
wantQuery: "SELECT * FROM `test` WHERE JSON_TYPE(`j`, \"$.attributes[1].body\") IS NOT NULL",
wantQuery: "SELECT * FROM `test` WHERE JSON_TYPE(`j`, '$.attributes[1].body') IS NOT NULL",
},
{
input: sql.Dialect(dialect.SQLite).
Select("*").
From(sql.Table("test")).
Where(sqljson.HasKey("j", sqljson.DotPath("a.*.c"))),
wantQuery: "SELECT * FROM `test` WHERE JSON_TYPE(`j`, \"$.a.*.c\") IS NOT NULL",
wantQuery: "SELECT * FROM `test` WHERE JSON_TYPE(`j`, '$.a.*.c') IS NOT NULL",
},
{
input: sql.Dialect(dialect.SQLite).
@@ -81,7 +81,7 @@ func TestWritePath(t *testing.T) {
sql.EQ("active", true),
),
),
wantQuery: "SELECT * FROM `test` WHERE `id` > ? AND JSON_TYPE(`j`, \"$.a.*.c\") IS NOT NULL AND `active`",
wantQuery: "SELECT * FROM `test` WHERE `id` > ? AND JSON_TYPE(`j`, '$.a.*.c') IS NOT NULL AND `active`",
wantArgs: []any{100},
},
{
@@ -100,7 +100,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueEQ("a", "a", sqljson.Path("b", "c", "[1]", "d"), sqljson.Unquote(true))),
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, \"$.b.c[1].d\")) = ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, '$.b.c[1].d')) = ?",
wantArgs: []any{"a"},
},
{
@@ -148,7 +148,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.LenEQ("a", 1)),
wantQuery: "SELECT * FROM `users` WHERE JSON_LENGTH(`a`, \"$\") = ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_LENGTH(`a`, '$') = ?",
wantArgs: []any{1},
},
{
@@ -156,7 +156,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.LenEQ("a", 1)),
wantQuery: "SELECT * FROM `users` WHERE JSON_ARRAY_LENGTH(`a`, \"$\") = ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_ARRAY_LENGTH(`a`, '$') = ?",
wantArgs: []any{1},
},
{
@@ -171,7 +171,7 @@ func TestWritePath(t *testing.T) {
sqljson.LenLTE("a", 1, sqljson.Path("e")),
),
),
wantQuery: "SELECT * FROM `users` WHERE JSON_ARRAY_LENGTH(`a`, \"$.b\") > ? OR JSON_ARRAY_LENGTH(`a`, \"$.c\") >= ? OR JSON_ARRAY_LENGTH(`a`, \"$.d\") < ? OR JSON_ARRAY_LENGTH(`a`, \"$.e\") <= ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_ARRAY_LENGTH(`a`, '$.b') > ? OR JSON_ARRAY_LENGTH(`a`, '$.c') >= ? OR JSON_ARRAY_LENGTH(`a`, '$.d') < ? OR JSON_ARRAY_LENGTH(`a`, '$.e') <= ?",
wantArgs: []any{1, 1, 1, 1},
},
{
@@ -179,7 +179,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueContains("tags", "foo")),
wantQuery: "SELECT * FROM `users` WHERE JSON_CONTAINS(`tags`, ?, \"$\") = ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_CONTAINS(`tags`, ?, '$') = ?",
wantArgs: []any{"\"foo\"", 1},
},
{
@@ -187,7 +187,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueContains("tags", 1, sqljson.Path("a"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_CONTAINS(`tags`, ?, \"$.a\") = ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_CONTAINS(`tags`, ?, '$.a') = ?",
wantArgs: []any{"1", 1},
},
{
@@ -195,7 +195,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueContains("tags", "foo")),
wantQuery: "SELECT * FROM `users` WHERE EXISTS(SELECT * FROM JSON_EACH(`tags`, \"$\") WHERE `value` = ?)",
wantQuery: "SELECT * FROM `users` WHERE EXISTS(SELECT * FROM JSON_EACH(`tags`, '$') WHERE `value` = ?)",
wantArgs: []any{"foo"},
},
{
@@ -203,7 +203,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueContains("tags", 1, sqljson.Path("a"))),
wantQuery: "SELECT * FROM `users` WHERE EXISTS(SELECT * FROM JSON_EACH(`tags`, \"$.a\") WHERE `value` = ?)",
wantQuery: "SELECT * FROM `users` WHERE EXISTS(SELECT * FROM JSON_EACH(`tags`, '$.a') WHERE `value` = ?)",
wantArgs: []any{1},
},
{
@@ -234,14 +234,14 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueIsNull("c", sqljson.Path("a"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_CONTAINS(`c`, 'null', \"$.a\")",
wantQuery: "SELECT * FROM `users` WHERE JSON_CONTAINS(`c`, 'null', '$.a')",
},
{
input: sql.Dialect(dialect.SQLite).
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueIsNull("c", sqljson.Path("a"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_TYPE(`c`, \"$.a\") = 'null'",
wantQuery: "SELECT * FROM `users` WHERE JSON_TYPE(`c`, '$.a') = 'null'",
},
{
input: sql.Dialect(dialect.Postgres).
@@ -269,7 +269,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.StringContains("a", "substr", sqljson.Path("b", "c", "[1]", "d"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, \"$.b.c[1].d\")) LIKE ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, '$.b.c[1].d')) LIKE ?",
wantArgs: []any{"%substr%"},
},
{
@@ -282,7 +282,7 @@ func TestWritePath(t *testing.T) {
sqljson.StringContains("b", "d", sqljson.Path("b")),
),
),
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, \"$.a\")) LIKE ? AND JSON_UNQUOTE(JSON_EXTRACT(`b`, \"$.b\")) LIKE ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, '$.a')) LIKE ? AND JSON_UNQUOTE(JSON_EXTRACT(`b`, '$.b')) LIKE ?",
wantArgs: []any{"%c%", "%d%"},
},
{
@@ -298,7 +298,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.StringHasPrefix("a", "substr", sqljson.Path("b", "c", "[1]", "d"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, \"$.b.c[1].d\")) LIKE ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, '$.b.c[1].d')) LIKE ?",
wantArgs: []any{"substr%"},
},
{
@@ -314,7 +314,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.StringHasSuffix("a", "substr", sqljson.Path("b", "c", "[1]", "d"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, \"$.b.c[1].d\")) LIKE ?",
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, '$.b.c[1].d')) LIKE ?",
wantArgs: []any{"%substr"},
},
{
@@ -322,7 +322,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueIn("a", []any{"a", "b"}, sqljson.Path("b"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, \"$.b\")) IN (?, ?)",
wantQuery: "SELECT * FROM `users` WHERE JSON_UNQUOTE(JSON_EXTRACT(`a`, '$.b')) IN (?, ?)",
wantArgs: []any{"a", "b"},
},
{
@@ -330,7 +330,7 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueIn("a", []any{1, 2}, sqljson.Path("b"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, \"$.b\") IN (?, ?)",
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, '$.b') IN (?, ?)",
wantArgs: []any{1, 2},
},
{
@@ -338,9 +338,17 @@ func TestWritePath(t *testing.T) {
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueIn("a", []any{1, "a"}, sqljson.Path("b"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, \"$.b\") IN (?, ?)",
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, '$.b') IN (?, ?)",
wantArgs: []any{1, "a"},
},
{
input: sql.Dialect(dialect.MySQL).
Select("*").
From(sql.Table("users")).
Where(sqljson.ValueIn("a", []any{1, 2}, sqljson.Path("foo-bar", "3000"))),
wantQuery: "SELECT * FROM `users` WHERE JSON_EXTRACT(`a`, '$.\"foo-bar\".\"3000\"') IN (?, ?)",
wantArgs: []any{1, 2},
},
}
for i, tt := range tests {
t.Run(strconv.Itoa(i), func(t *testing.T) {