xorm/xorm
xorm/xorm
63
357
Fork 207
Code Issues 373 Pull Requests 18 Actions 9 Releases 35 Activity

Improve quote policy #1567

Merged
lunny merged 8 commits from lunny/quote_policy2 into master 2020-03-06 07:48:36 +00:00
Conversation 0 Commits 8 Files Changed 18 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 717aabf022 - Show all commits

12
schemas/quote_test.go
View File

@ -13,7 +13,7 @@ import (
func TestAlwaysQuoteTo(t *testing.T) {
var (
quoter = Quoter{'[', ']', AlwaysReverse}
quoter = Quoter{'[', ']', AlwaysReserve}
kases = []struct {
expected string
value string
@ -84,7 +84,7 @@ func TestReversedQuoteTo(t *testing.T) {
func TestNoQuoteTo(t *testing.T) {
var (
quoter = Quoter{'[', ']', AlwaysNoReverse}
quoter = Quoter{'[', ']', AlwaysNoReserve}
kases = []struct {
expected string
value string
@ -117,19 +117,19 @@ func TestNoQuoteTo(t *testing.T) {
func TestJoin(t *testing.T) {
cols := []string{"f1", "f2", "f3"}
quoter := Quoter{'[', ']', AlwaysReverse}
quoter := Quoter{'[', ']', AlwaysReserve}
assert.EqualValues(t, "[a],[b]", quoter.Join([]string{"a", " b"}, ","))
assert.EqualValues(t, "[f1], [f2], [f3]", quoter.Join(cols, ", "))
quoter.IsReverse = AlwaysNoReverse
quoter.IsReserved = AlwaysNoReserve
assert.EqualValues(t, "f1, f2, f3", quoter.Join(cols, ", "))
}
func TestStrings(t *testing.T) {
cols := []string{"f1", "f2", "t3.f3"}
quoter := Quoter{'[', ']', AlwaysReverse}
quoter := Quoter{'[', ']', AlwaysReserve}
quotedCols := quoter.Strings(cols)
assert.EqualValues(t, []string{"[f1]", "[f2]", "[t3].[f3]"}, quotedCols)
@ -143,6 +143,6 @@ func TestTrim(t *testing.T) {
for src, dst := range kases {
assert.EqualValues(t, src, CommonQuoter.Trim(src))
assert.EqualValues(t, dst, Quoter{'[', ']', AlwaysReverse}.Trim(src))
assert.EqualValues(t, dst, Quoter{'[', ']', AlwaysReserve}.Trim(src))
}
}