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

优化查询条件解析，where中添加可以不用参数绑定的条件

Browse Source
This commit is contained in:
xing 2023-02-23 11:43:02 +08:00
parent 4aa54b1ca7
commit efeeb8b675
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
model/parse.go
View File

@ -2,18 +2,17 @@ package model
import (
"github.com/fthvgb1/wp-go/helper/slice"
str "github.com/fthvgb1/wp-go/helper/strings"
"strconv"
"strings"
)
func (w SqlBuilder) parseField(ss []string, s *strings.Builder) {
if strings.Contains(ss[0], ".") && !strings.Contains(ss[0], "(") {
s.WriteString("`")
sx := strings.Split(ss[0], ".")
s.WriteString(sx[0])
s.WriteString("`.`")
s.WriteString(sx[1])
s.WriteString("`")
x := slice.Map(strings.Split(ss[0], "."), func(t string) string {
return str.Join("`", t, "`")
})
s.WriteString(strings.Join(x, "."))
} else if !strings.Contains(ss[0], ".") && !strings.Contains(ss[0], "(") {
s.WriteString("`")
s.WriteString(ss[0])
@ -26,13 +25,9 @@ func (w SqlBuilder) parseField(ss []string, s *strings.Builder) {
func (w SqlBuilder) parseIn(ss []string, s *strings.Builder, c *int, args *[]any, in *[][]any) (t bool) {
if slice.IsContained(ss[1], []string{"in", "not in"}) && len(*in) > 0 {
s.WriteString(" (")
for _, p := range (*in)[*c] {
s.WriteString("?,")
*args = append(*args, p)
}
sx := s.String()
s.Reset()
s.WriteString(strings.TrimRight(sx, ","))
x := strings.TrimRight(strings.Repeat("?,", len((*in)[*c])), ",")
s.WriteString(x)
*args = append(*args, (*in)[*c]...)
s.WriteString(")")
*c++
t = true
@ -81,11 +76,15 @@ func (w SqlBuilder) ParseWhere(in *[][]any) (string, []any, error) {
args := make([]any, 0, len(w))
c := 0
for _, ss := range w {
if len(ss) == 2 {
switch len(ss) {
case 1:
s.WriteString(ss[0])
s.WriteString(" and ")
case 2:
w.parseField(ss, &s)
s.WriteString("=? and ")
args = append(args, ss[1])
} else if len(ss) >= 3 && len(ss) < 5 {
case 3, 4:
w.parseField(ss, &s)
s.WriteString(ss[1])
if w.parseIn(ss, &s, &c, &args, in) {
@ -97,7 +96,9 @@ func (w SqlBuilder) ParseWhere(in *[][]any) (string, []any, error) {
if err != nil {
return "", nil, err
}
} else if len(ss) >= 5 && len(ss)%5 == 0 {
}
if len(ss) >= 5 && len(ss)%5 == 0 {
j := len(ss) / 5
for i := 0; i < j; i++ {
start := i * 5
@ -149,7 +150,7 @@ func (w SqlBuilder) ParseWhere(in *[][]any) (string, []any, error) {
func (w SqlBuilder) parseOrderBy() string {
s := strings.Builder{}
for _, ss := range w {
if len(ss) == 2 && ss[0] != "" && slice.IsContained(ss[1], []string{"asc", "desc"}) {
if len(ss) == 2 && ss[0] != "" && slice.IsContained(strings.ToLower(ss[1]), []string{"asc", "desc"}) {
s.WriteString(" ")
s.WriteString(ss[0])
s.WriteString(" ")

8
model/querycondition_test.go
View File

@ -510,7 +510,7 @@ func Test_findScanner(t *testing.T) {
func BenchmarkSqlxQueryXX(b *testing.B) {
for i := 0; i < b.N; i++ {
var r []options
err := ddb.Select(&r, "select * from wp_options where option_id<100")
err := ddb.Select(&r, "select * from wp_options where option_id<100 and option_id>50")
if err != nil {
panic(err)
}
@ -523,7 +523,7 @@ func BenchmarkScannerXX(b *testing.B) {
err := findScanner[options](glob, ctx, func(t options) {
r = append(r, t)
//fmt.Println(t)
}, Conditions(Where(SqlBuilder{{"option_id", "<", "100", "int"}})))
}, Conditions(Where(SqlBuilder{{"option_id<100"}, {"option_id>50"}})))
if err != nil {
panic(err)
}
@ -532,7 +532,9 @@ func BenchmarkScannerXX(b *testing.B) {
func BenchmarkFindsXX(b *testing.B) {
for i := 0; i < b.N; i++ {
_, err := finds[options](glob, ctx, Conditions(Where(SqlBuilder{{"option_id", "<", "100", "int"}})))
_, err := finds[options](glob, ctx, Conditions(
Where(SqlBuilder{{"option_id<100"}, {"option_id>50"}})),
)
if err != nil {
panic(err)
}