xing/wp-go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

完善

Browse Source
This commit is contained in:
xing 2022-09-16 23:03:55 +08:00
parent 3272dd4aea
commit 239a8729a6
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
models/model.go
View File

@ -91,19 +91,17 @@ func (w SqlBuilder) ParseWhere(in ...[]interface{}) (string, []interface{}) {
for i := 0; i < j; i++ { for i := 0; i < j; i++ {
start := i * 5 start := i * 5
end := start + 5 end := start + 5
if ss[start] == "or" {
st := s.String() st := s.String()
if strings.Contains(st, "and ") { if strings.Contains(st, "and ") && ss[start] == "or" {
st = strings.TrimRight(st, "and ") st = strings.TrimRight(st, "and ")
s.Reset() s.Reset()
s.WriteString(st) s.WriteString(st)
s.WriteString(" or ") s.WriteString(fmt.Sprintf(" %s ", ss[start]))
} }
if i == 0 { if i == 0 {
s.WriteString("( ") s.WriteString("( ")
fl = true fl = true
} }
w.parseField(ss[start+1:end], &s) w.parseField(ss[start+1:end], &s)
if w.parseIn(ss[start+1:end], &s, &c, &args, in) { if w.parseIn(ss[start+1:end], &s, &c, &args, in) {
s.WriteString(" and ") s.WriteString(" and ")
@ -112,17 +110,6 @@ func (w SqlBuilder) ParseWhere(in ...[]interface{}) (string, []interface{}) {
s.WriteString(ss[start+2]) s.WriteString(ss[start+2])
s.WriteString(" ? and ") s.WriteString(" ? and ")
w.parseType(ss[start+1:end], &s, &args) w.parseType(ss[start+1:end], &s, &args)
} else {
w.parseField(ss[start+1:end], &s)
if w.parseIn(ss[start+1:end], &s, &c, &args, in) {
s.WriteString(" and ")
continue
}
s.WriteString(ss[start+2])
s.WriteString(" ? and ")
w.parseType(ss[start+1:start+4], &s, &args)
}
if i == j-1 && fl { if i == j-1 && fl {
st := s.String() st := s.String()
st = strings.TrimRight(st, "and ") st = strings.TrimRight(st, "and ")