HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix arg conversion (#61)

This commit is contained in:
Lunny Xiao 2019-09-28 05:59:35 +00:00 committed by Gitea
parent c96a57cc40
commit 90aeac8d08
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
filter.go
View File

@ -73,20 +73,14 @@ type SeqFilter struct {
func convertQuestionMark(sql, prefix string, start int) string { func convertQuestionMark(sql, prefix string, start int) string {
var buf strings.Builder var buf strings.Builder
var beginSingleQuote bool var beginSingleQuote bool
var beginTransfer bool
var index = start var index = start
for _, c := range sql { for _, c := range sql {
if !beginSingleQuote && c == '?' { if !beginSingleQuote && c == '?' {
buf.WriteString(fmt.Sprintf("%s%v", prefix, index)) buf.WriteString(fmt.Sprintf("%s%v", prefix, index))
index++ index++
} else { } else {
if c == '\\' { if c == '\'' {
beginTransfer = true beginSingleQuote = !beginSingleQuote
} else {
if !beginTransfer && c == '\'' {
beginSingleQuote = !beginSingleQuote
}
beginTransfer = false
} }
buf.WriteRune(c) buf.WriteRune(c)
} }

5
filter_test.go
View File

@ -28,7 +28,10 @@ func TestSeqFilter(t *testing.T) {
var kases = map[string]string{ var kases = map[string]string{
"SELECT * FROM TABLE1 WHERE a=? AND b=?": "SELECT * FROM TABLE1 WHERE a=$1 AND b=$2", "SELECT * FROM TABLE1 WHERE a=? AND b=?": "SELECT * FROM TABLE1 WHERE a=$1 AND b=$2",
"SELECT 1, '???', '2006-01-02 15:04:05' FROM TABLE1 WHERE a=? AND b=?": "SELECT 1, '???', '2006-01-02 15:04:05' FROM TABLE1 WHERE a=$1 AND b=$2", "SELECT 1, '???', '2006-01-02 15:04:05' FROM TABLE1 WHERE a=? AND b=?": "SELECT 1, '???', '2006-01-02 15:04:05' FROM TABLE1 WHERE a=$1 AND b=$2",
"select '1\\'?' from issue": "select '1\\'?' from issue", "select '1''?' from issue": "select '1''?' from issue",
"select '1\\??' from issue": "select '1\\??' from issue",
"select '1\\\\',? from issue": "select '1\\\\',$1 from issue",
"select '1\\''?',? from issue": "select '1\\''?',$1 from issue",
} }
for sql, result := range kases { for sql, result := range kases {
assert.EqualValues(t, result, convertQuestionMark(sql, "$", 1)) assert.EqualValues(t, result, convertQuestionMark(sql, "$", 1))