Skip to content

Commit d2bf38b

Browse files
LostImagin4tionLostImagin4tion
committed
dialect/sql: fixed tests
1 parent 3b73793 commit d2bf38b

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎dialect/sql/builder.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@ func escapeYDB(word string) (string, bool) {
13931393

13941394
func escapeWith(word string, escChar byte) (string, bool) {
13951395
var n int
1396-
for i := range word {
1396+
for i := 0; i < len(word); i++ {
13971397
if ch := word[i]; ch == '%' || ch == '_' || ch == escChar {
13981398
n++
13991399
}
@@ -1406,7 +1406,7 @@ func escapeWith(word string, escChar byte) (string, bool) {
14061406
var builder strings.Builder
14071407
builder.Grow(len(word) + n)
14081408

1409-
for i := range word {
1409+
for i := 0; i < len(word); i++ {
14101410
if ch := word[i]; ch == '%' || ch == '_' || ch == escChar {
14111411
builder.WriteByte(escChar)
14121412
}

‎dialect/sql/builder_test.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ func TestBuilder(t *testing.T) {
746746
Join(t2).
747747
On(t1.C("id"), t2.C("user_id"))
748748
}(),
749-
wantQuery: "SELECT `u`.`id`, `g`.`name` FROM `users` AS `u` JOIN `groups` AS `g` ON `u`.`id` = `g`.`user_id`",
749+
wantQuery: "SELECT `u`.`id` AS `id`, `g`.`name` AS `name` FROM `users` AS `u` JOIN `groups` AS `g` ON `u`.`id` = `g`.`user_id`",
750750
},
751751
{
752752
input: func() Querier {
@@ -1131,7 +1131,7 @@ func TestBuilder(t *testing.T) {
11311131
{
11321132
input: Dialect(dialect.YDB).
11331133
Select().Count().From(Table("users")),
1134-
wantQuery: "SELECT COUNT(*) FROM `users`",
1134+
wantQuery: "SELECT COUNT(*) AS `count` FROM `users`",
11351135
},
11361136
{
11371137
input: Select().Count(Distinct("id")).From(Table("users")),
@@ -1205,7 +1205,7 @@ func TestBuilder(t *testing.T) {
12051205
Select("name", Count("*")).
12061206
From(Table("users")).
12071207
GroupBy("name"),
1208-
wantQuery: "SELECT `name`, COUNT(*) FROM `users` GROUP BY `name`",
1208+
wantQuery: "SELECT `name`, COUNT(*) AS `count` FROM `users` GROUP BY `name`",
12091209
},
12101210
{
12111211
input: Select("name", Count("*")).
@@ -1831,7 +1831,7 @@ AND "users"."id1" < "users"."id2") AND "users"."id1" <= "users"."id2"`, "\n", ""
18311831
Join(t2).
18321832
On(t1.C("user_id"), t2.C("id"))
18331833
}(),
1834-
wantQuery: "SELECT `orders`.`id`, `u`.`name` FROM `orders` JOIN `users` VIEW `idx_email` AS `u` ON `orders`.`user_id` = `u`.`id`",
1834+
wantQuery: "SELECT `orders`.`id` AS `id`, `u`.`name` AS `name` FROM `orders` JOIN `users` VIEW `idx_email` AS `u` ON `orders`.`user_id` = `u`.`id`",
18351835
},
18361836
{
18371837
input: func() Querier {
@@ -1843,7 +1843,7 @@ AND "users"."id1" < "users"."id2") AND "users"."id1" <= "users"."id2"`, "\n", ""
18431843
Join(t2).
18441844
On(t1.C("ref"), t2.C("ref"))
18451845
}(),
1846-
wantQuery: "SELECT `a`.`value`, `b`.`value` FROM `a_table` AS `a` JOIN `b_table` VIEW `b_index_ref` AS `b` ON `a`.`ref` = `b`.`ref`",
1846+
wantQuery: "SELECT `a`.`value` AS `value`, `b`.`value` AS `value` FROM `a_table` AS `a` JOIN `b_table` VIEW `b_index_ref` AS `b` ON `a`.`ref` = `b`.`ref`",
18471847
},
18481848
{
18491849
input: func() Querier {
@@ -1869,7 +1869,7 @@ AND "users"."id1" < "users"."id2") AND "users"."id1" <= "users"."id2"`, "\n", ""
18691869
LeftSemiJoin(t2).
18701870
On(t1.C("id"), t2.C("user_id"))
18711871
}(),
1872-
wantQuery: "SELECT `users`.`id`, `users`.`name` FROM `users` LEFT SEMI JOIN `blacklist` AS `t1` ON `users`.`id` = `t1`.`user_id`",
1872+
wantQuery: "SELECT `users`.`id` AS `id`, `users`.`name` AS `name` FROM `users` LEFT SEMI JOIN `blacklist` AS `t1` ON `users`.`id` = `t1`.`user_id`",
18731873
},
18741874
{
18751875
input: func() Querier {
@@ -1881,7 +1881,7 @@ AND "users"."id1" < "users"."id2") AND "users"."id1" <= "users"."id2"`, "\n", ""
18811881
RightSemiJoin(t2).
18821882
On(t1.C("user_id"), t2.C("id"))
18831883
}(),
1884-
wantQuery: "SELECT `t1`.`id`, `t1`.`email` FROM `orders` RIGHT SEMI JOIN `active_users` AS `t1` ON `orders`.`user_id` = `t1`.`id`",
1884+
wantQuery: "SELECT `t1`.`id` AS `id`, `t1`.`email` AS `email` FROM `orders` RIGHT SEMI JOIN `active_users` AS `t1` ON `orders`.`user_id` = `t1`.`id`",
18851885
},
18861886
{
18871887
input: func() Querier {
@@ -1893,7 +1893,7 @@ AND "users"."id1" < "users"."id2") AND "users"."id1" <= "users"."id2"`, "\n", ""
18931893
LeftOnlyJoin(t2).
18941894
On(t1.C("id"), t2.C("id"))
18951895
}(),
1896-
wantQuery: "SELECT `users`.`id`, `users`.`name` FROM `users` LEFT ONLY JOIN `deleted_users` AS `t1` ON `users`.`id` = `t1`.`id`",
1896+
wantQuery: "SELECT `users`.`id` AS `id`, `users`.`name` AS `name` FROM `users` LEFT ONLY JOIN `deleted_users` AS `t1` ON `users`.`id` = `t1`.`id`",
18971897
},
18981898
{
18991899
input: func() Querier {
@@ -1905,7 +1905,7 @@ AND "users"."id1" < "users"."id2") AND "users"."id1" <= "users"."id2"`, "\n", ""
19051905
RightOnlyJoin(t2).
19061906
On(t1.C("user_id"), t2.C("id"))
19071907
}(),
1908-
wantQuery: "SELECT `t1`.`id`, `t1`.`status` FROM `archived` RIGHT ONLY JOIN `users` AS `t1` ON `archived`.`user_id` = `t1`.`id`",
1908+
wantQuery: "SELECT `t1`.`id` AS `id`, `t1`.`status` AS `status` FROM `archived` RIGHT ONLY JOIN `users` AS `t1` ON `archived`.`user_id` = `t1`.`id`",
19091909
},
19101910
{
19111911
input: func() Querier {
@@ -1917,7 +1917,7 @@ AND "users"."id1" < "users"."id2") AND "users"."id1" <= "users"."id2"`, "\n", ""
19171917
ExclusionJoin(t2).
19181918
On(t1.C("key"), t2.C("key"))
19191919
}(),
1920-
wantQuery: "SELECT `a`.`key`, `b`.`key` FROM `table_a` AS `a` EXCLUSION JOIN `table_b` AS `b` ON `a`.`key` = `b`.`key`",
1920+
wantQuery: "SELECT `a`.`key` AS `key`, `b`.`key` AS `key` FROM `table_a` AS `a` EXCLUSION JOIN `table_b` AS `b` ON `a`.`key` = `b`.`key`",
19211921
},
19221922
{
19231923
input: func() Querier {
@@ -1941,7 +1941,7 @@ AND "users"."id1" < "users"."id2") AND "users"."id1" <= "users"."id2"`, "\n", ""
19411941
LeftJoin(t3).
19421942
OnP(And(EQ(t3.C("ref"), Expr(t1.C("key"))), EQ(t3.C("column1"), Expr(t2.C("value")))))
19431943
}(),
1944-
wantQuery: "SELECT `a`.`value`, `b`.`value`, `c`.`column2` FROM `a_table` AS `a` CROSS JOIN `b_table` AS `b` LEFT JOIN `c_table` AS `c` ON `c`.`ref` = `a`.`key` AND `c`.`column1` = `b`.`value`",
1944+
wantQuery: "SELECT `a`.`value` AS `value`, `b`.`value` AS `value`, `c`.`column2` AS `column2` FROM `a_table` AS `a` CROSS JOIN `b_table` AS `b` LEFT JOIN `c_table` AS `c` ON `c`.`ref` = `a`.`key` AND `c`.`column1` = `b`.`value`",
19451945
},
19461946
{
19471947
input: Dialect(dialect.YDB).
@@ -2323,7 +2323,7 @@ func TestSelector_VIEW_SecondaryIndex_YDB(t *testing.T) {
23232323
Where(EQ(users.C("name"), "John Doe")).
23242324
Query()
23252325

2326-
require.Equal(t, "SELECT `t1`.`series_id`, `t1`.`title` FROM `series` VIEW `users_index` AS `t1` JOIN `users` VIEW `name_index` AS `t2` ON `t1`.`uploaded_user_id` = `t2`.`user_id` WHERE `t2`.`name` = $p0", query)
2326+
require.Equal(t, "SELECT `t1`.`series_id` AS `series_id`, `t1`.`title` AS `title` FROM `series` VIEW `users_index` AS `t1` JOIN `users` VIEW `name_index` AS `t2` ON `t1`.`uploaded_user_id` = `t2`.`user_id` WHERE `t2`.`name` = $p0", query)
23272327
require.Equal(t, []any{driver.NamedValue{Name: "p0", Value: "John Doe"}}, args)
23282328
})
23292329

@@ -2344,7 +2344,7 @@ func TestBatchUpdate_YDB(t *testing.T) {
23442344
Set("Value2", 0).
23452345
Where(GT("Key1", 1)).
23462346
Query()
2347-
2347+
23482348
require.Equal(t, "BATCH UPDATE `my_table` SET `Value1` = $p0, `Value2` = $p1 WHERE `Key1` > $p2", query)
23492349
require.Equal(t, []any{
23502350
driver.NamedValue{Name: "p0", Value: "foo"},
@@ -2358,9 +2358,9 @@ func TestBatchUpdate_YDB(t *testing.T) {
23582358
BatchUpdate("users").
23592359
Set("status", "active").
23602360
Where(GT("created_at", "2024-01-01"))
2361-
2361+
23622362
query, args, err := builder.QueryErr()
2363-
2363+
23642364
require.Empty(t, query)
23652365
require.Empty(t, args)
23662366
require.Error(t, err)
@@ -2371,9 +2371,9 @@ func TestBatchUpdate_YDB(t *testing.T) {
23712371
BatchUpdate("users").
23722372
Set("status", "active").
23732373
Returning("id", "status")
2374-
2374+
23752375
query, args, err := builder.QueryErr()
2376-
2376+
23772377
require.Empty(t, query)
23782378
require.Empty(t, args)
23792379
require.Error(t, err)
@@ -2382,13 +2382,13 @@ func TestBatchUpdate_YDB(t *testing.T) {
23822382
t.Run("BATCH UPDATE with UPDATE ON pattern should error", func(t *testing.T) {
23832383
d := Dialect(dialect.YDB)
23842384
subquery := d.Select("id").From(Table("orders")).Where(EQ("status", "pending"))
2385-
2385+
23862386
builder := d.BatchUpdate("users").
23872387
Set("status", "active").
23882388
On(subquery)
2389-
2389+
23902390
query, args, err := builder.QueryErr()
2391-
2391+
23922392
require.Empty(t, query)
23932393
require.Empty(t, args)
23942394
require.Error(t, err)
@@ -2402,7 +2402,7 @@ func TestBatchDelete_YDB(t *testing.T) {
24022402
query, args := d.BatchDelete("my_table").
24032403
Where(And(GT("Key1", 1), GTE("Key2", "One"))).
24042404
Query()
2405-
2405+
24062406
require.Equal(t, "BATCH DELETE FROM `my_table` WHERE `Key1` > $p0 AND `Key2` >= $p1", query)
24072407
require.Equal(t, []any{
24082408
driver.NamedValue{Name: "p0", Value: 1},
@@ -2414,9 +2414,9 @@ func TestBatchDelete_YDB(t *testing.T) {
24142414
builder := Dialect(dialect.MySQL).
24152415
BatchDelete("users").
24162416
Where(GT("id", 100))
2417-
2417+
24182418
query, args, err := builder.QueryErr()
2419-
2419+
24202420
require.Empty(t, query)
24212421
require.Empty(t, args)
24222422
require.Error(t, err)
@@ -2427,9 +2427,9 @@ func TestBatchDelete_YDB(t *testing.T) {
24272427
BatchDelete("users").
24282428
Where(GT("id", 100)).
24292429
Returning("id")
2430-
2430+
24312431
query, args, err := builder.QueryErr()
2432-
2432+
24332433
require.Empty(t, query)
24342434
require.Empty(t, args)
24352435
require.Error(t, err)
@@ -2438,12 +2438,12 @@ func TestBatchDelete_YDB(t *testing.T) {
24382438
t.Run("BATCH DELETE with DELETE ON pattern should error", func(t *testing.T) {
24392439
d := Dialect(dialect.YDB)
24402440
subquery := d.Select("id").From(Table("users")).Where(EQ("status", "deleted"))
2441-
2441+
24422442
builder := d.BatchDelete("users").
24432443
On(subquery)
2444-
2444+
24452445
query, args, err := builder.QueryErr()
2446-
2446+
24472447
require.Empty(t, query)
24482448
require.Empty(t, args)
24492449
require.Error(t, err)

0 commit comments

Comments
 (0)