From f556e8a89922b90f8de15e8d072b7263bb96c2b9 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 19 Oct 2023 16:29:40 +0800 Subject: [PATCH] Add test for #2331 --- schemas/quote_test.go | 10 ++++++++-- tests/session_query_test.go | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/schemas/quote_test.go b/schemas/quote_test.go index f84dfb7d..1b08579a 100644 --- a/schemas/quote_test.go +++ b/schemas/quote_test.go @@ -131,6 +131,8 @@ func TestJoin(t *testing.T) { assert.EqualValues(t, "[a].*,[b].[c]", quoter.Join([]string{"a.*", " b.c"}, ",")) + assert.EqualValues(t, "[a] [c]", quoter.Join([]string{"a c"}, ",")) + assert.EqualValues(t, "[f1], [f2], [f3]", quoter.Join(cols, ", ")) quoter.IsReserved = AlwaysNoReserve @@ -146,7 +148,7 @@ func TestStrings(t *testing.T) { } func TestTrim(t *testing.T) { - var kases = map[string]string{ + kases := map[string]string{ "[table_name]": "table_name", "[schema].[table_name]": "schema.table_name", } @@ -159,7 +161,7 @@ func TestTrim(t *testing.T) { func TestReplace(t *testing.T) { q := Quoter{'[', ']', AlwaysReserve} - var kases = []struct { + kases := []struct { source string expected string }{ @@ -171,6 +173,10 @@ func TestReplace(t *testing.T) { "SELECT 'abc```test```''', `a` FROM b", "SELECT 'abc```test```''', [a] FROM b", }, + { + "SELECT * FROM `a` INNER JOIN `b` `c` WHERE `a`.`id` = `c`.`a_id`", + "SELECT * FROM [a] INNER JOIN [b] [c] WHERE [a].[id] = [c].[a_id]", + }, { "UPDATE table SET `a` = ~ `a`, `b`='abc`'", "UPDATE table SET [a] = ~ [a], [b]='abc`'", diff --git a/tests/session_query_test.go b/tests/session_query_test.go index 4df85f79..726b19e2 100644 --- a/tests/session_query_test.go +++ b/tests/session_query_test.go @@ -493,4 +493,4 @@ func TestRowsReset(t *testing.T) { assert.EqualValues(t, "4", rrs[0].Name) assert.EqualValues(t, "5", rrs[1].Name) assert.EqualValues(t, "6", rrs[2].Name) -} +} \ No newline at end of file