wecisecode 1 неделя назад
Родитель
Сommit
542f1ea2fd
3 измененных файлов с 9 добавлено и 3 удалено
  1. 1 1
      go.mod
  2. 2 2
      go.sum
  3. 6 0
      odbctest/odbcmql/mqls_action.go

+ 1 - 1
go.mod

@@ -5,7 +5,7 @@ go 1.24.0
 toolchain go1.24.5
 
 require (
-	git.wecise.com/wecise/odb-go v0.0.0-20260521084720-e749f7113979
+	git.wecise.com/wecise/odb-go v0.0.0-20260722103146-3e5a516fedcb
 	gitee.com/wecisecode/util v0.9.0
 	github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e
 	github.com/spf13/cast v1.7.1

+ 2 - 2
go.sum

@@ -1,7 +1,7 @@
 git.wecise.com/wecise/common v0.0.0-20260521084905-b0dfcd2113fd h1:g2TnNvYCq/oLl10dKOAsNd/O7jjYOcI6LWvMqFht8h0=
 git.wecise.com/wecise/common v0.0.0-20260521084905-b0dfcd2113fd/go.mod h1:J0P6J1koMGFqUV5ZJdxFn97LFO8btrO6Nvei62iDX9I=
-git.wecise.com/wecise/odb-go v0.0.0-20260521084720-e749f7113979 h1:fNDgTLiKUvgXqUky+86cT8JGiWLkLhYpBznQvzfJVg4=
-git.wecise.com/wecise/odb-go v0.0.0-20260521084720-e749f7113979/go.mod h1:LDfoIJF3rTAGEEIhWmObFj9OJ59YOUGm0GhGfAX0t2Q=
+git.wecise.com/wecise/odb-go v0.0.0-20260722103146-3e5a516fedcb h1:KGfIGbfCenSSo8gAkeefeoJLZjIKXLEnnk/kT+kePDA=
+git.wecise.com/wecise/odb-go v0.0.0-20260722103146-3e5a516fedcb/go.mod h1:LDfoIJF3rTAGEEIhWmObFj9OJ59YOUGm0GhGfAX0t2Q=
 git.wecise.com/wecise/util v0.0.0-20260521072333-deebc20dd231 h1:bsL0Bh2/WwWpAhZEswu6BmQgCokkMgTfKawcG5gbrQ4=
 git.wecise.com/wecise/util v0.0.0-20260521072333-deebc20dd231/go.mod h1:86Qz15Bb08gzbz0f0hpjx8m7QFDC7DS1DhrQLicAIek=
 gitee.com/wecisecode/util v0.9.0 h1:aEtF2FcTzvvwnLLjdnZDVG7ZV6dsraQ3RiX4SAtsGzo=

+ 6 - 0
odbctest/odbcmql/mqls_action.go

@@ -12,6 +12,7 @@ import (
 	"git.wecise.com/wecise/odb-go/odb/mql/parser"
 	"git.wecise.com/wecise/odb-go/odb/mql/qstru"
 	"gitee.com/wecisecode/util/cast"
+	"gitee.com/wecisecode/util/merrs"
 	"gitee.com/wecisecode/util/mfmt"
 	"gitee.com/wecisecode/util/set/strset"
 	"gitee.com/wecisecode/util/sortedmap"
@@ -72,6 +73,11 @@ type ActionExprs struct {
 }
 
 func getActionExprs(mqlstr string, staticactions map[int]*Action) (actionexprs *ActionExprs, err error) {
+	defer func() {
+		if err != nil {
+			err = merrs.New(err, merrs.Map{"mql": mqlstr})
+		}
+	}()
 	actionexprs = &ActionExprs{
 		LinkedMap: sortedmap.NewLinkedMap(),
 		onerrorOption: &OnErrorOption{