Merge branch 'master' of https://github.com/runner-mei/GoBatis

core/parameters.go

@@ -140,6 +140,7 @@ func (sf structFinder) RValue(dialect Dialect, param *Param) (interface{}, error
 }
 
 type kvFinder struct {
+	Parameters Parameters 
 	mapper      *Mapper
 	paramNames  []string
 	paramValues []interface{}
@@ -186,6 +187,24 @@ func (kvf *kvFinder) RValue(dialect Dialect, param *Param) (interface{}, error)
 	return kvf.get(param.Name, rvalueGetter{dialect: dialect, param: param})
 }
 
+
+
+func (kvf *kvFinder) getByIndex(foundIdx int) (reflect.Value, bool) {
+	if kvf.cachedValues == nil {
+		kvf.cachedValues = make([]reflect.Value, len(kvf.paramValues))
+	}
+	rValue := kvf.cachedValues[foundIdx]
+	if !rValue.IsValid() {
+		value := kvf.paramValues[foundIdx]
+		if value == nil {
+			return reflect.Value{}, false
+		}
+		rValue = reflect.ValueOf(value)
+		kvf.cachedValues[foundIdx] = rValue
+	}
+	return rValue, true
+}
+
 func (kvf *kvFinder) get(name string, getter valueGetter) (interface{}, error) {
 	foundIdx := -1
 	for idx := range kvf.paramNames {
@@ -199,6 +218,19 @@ func (kvf *kvFinder) get(name string, getter valueGetter) (interface{}, error) {
 		return getter.value(kvf.paramValues[foundIdx])
 	}
 
+	if kvf.Parameters != nil {
+		value, err := kvf.Parameters.Get(name)
+		if err == nil {
+			return value, nil
+		}
+
+		if err != ErrNotFound {
+			return nil, err
+		}
+
+		return getter.value(value)
+	}
+
 	dotIndex := strings.IndexByte(name, '.')
 	if dotIndex < 0 {
 		//    这里的是为下面情况的特殊处理
@@ -211,32 +243,47 @@ func (kvf *kvFinder) get(name string, getter valueGetter) (interface{}, error) {
 		}
 		dotIndex = -1
 		foundIdx = 0
-	} else {
-		fieldName := name[:dotIndex]
-		for idx := range kvf.paramNames {
-			if kvf.paramNames[idx] == fieldName {
-				foundIdx = idx
-				break
-			}
-		}
-		if foundIdx < 0 {
-			return nil, ErrNotFound
+
+
+		rValue, ok := kvf.getByIndex(foundIdx)
+		if !ok {
+			return nil, ErrNotFound // errors.New("canot read param '" + name[dotIndex+1:] + "',  param '" + name[:dotIndex+1] + "' is nil")
 		}
+
+		return kvf.getFieldValue(name[dotIndex+1:], rValue, getter)
 	}
 
-	if kvf.cachedValues == nil {
-		kvf.cachedValues = make([]reflect.Value, len(kvf.paramValues))
+	fieldName := name[:dotIndex]
+	for idx := range kvf.paramNames {
+		if kvf.paramNames[idx] == fieldName {
+			foundIdx = idx
+			break
+		}
 	}
-	rValue := kvf.cachedValues[foundIdx]
-	if !rValue.IsValid() {
-		value := kvf.paramValues[foundIdx]
-		if value == nil {
+	if foundIdx >= 0 {
+		rValue, ok := kvf.getByIndex(foundIdx)
+		if !ok {
 			return nil, ErrNotFound // errors.New("canot read param '" + name[dotIndex+1:] + "',  param '" + name[:dotIndex+1] + "' is nil")
 		}
-		rValue = reflect.ValueOf(value)
-		kvf.cachedValues[foundIdx] = rValue
+		return kvf.getFieldValue(name[dotIndex+1:], rValue, getter)
 	}
 
+	if kvf.Parameters == nil {
+		return nil, ErrNotFound
+	}
+
+	value, err := kvf.Parameters.Get(fieldName)
+	if err != nil {
+		return nil, err
+	}
+	if value == nil {
+		return nil, ErrNotFound
+	}
+
+	return kvf.getFieldValue(name[dotIndex+1:], reflect.ValueOf(value), getter)
+}
+
+func (kvf *kvFinder) getFieldValue(fieldName string,rValue reflect.Value, getter valueGetter) (interface{}, error) {
 	kind := rValue.Kind()
 	if kind == reflect.Ptr {
 		kind = rValue.Type().Elem().Kind()
@@ -251,7 +298,7 @@ func (kvf *kvFinder) get(name string, getter valueGetter) (interface{}, error) {
 			return nil, ErrNotFound // errors.New("canot read param '" + name[:dotIndex+1] + "',  param '" + name[:dotIndex+1] + "' is nil")
 		}
 
-		value := rValue.MapIndex(reflect.ValueOf(name[dotIndex+1:]))
+		value := rValue.MapIndex(reflect.ValueOf(fieldName))
 		if !value.IsValid() {
 			return getter.value(nil)
 			// return nil, ErrNotFound //errors.New("canot read param '" + name[:dotIndex+1] + "',  param '" + name[:dotIndex+1] + "' is nil")
@@ -266,9 +313,9 @@ func (kvf *kvFinder) get(name string, getter valueGetter) (interface{}, error) {
 
 	tm := kvf.mapper.TypeMap(rValue.Type())
 
-	fi, ok := tm.FieldNames[name[dotIndex+1:]]
+	fi, ok := tm.FieldNames[fieldName]
 	if !ok {
-		fi, ok = tm.Names[name[dotIndex+1:]]
+		fi, ok = tm.Names[fieldName]
 		if !ok {
 			return nil, ErrNotFound
 		}

core/xml_expression.go

@@ -630,6 +630,7 @@ func (foreach *forEachExpression) execOne(printer *sqlPrinter, key, value interf
 	// newPrinter.ctx = &ctx
 
 	printer.ctx.finder = &kvFinder{
+		Parameters: oldFinder,
 		mapper:      printer.ctx.Mapper,
 		paramNames:  []string{foreach.el.item, foreach.el.index},
 		paramValues: []interface{}{value, key},
@@ -693,6 +694,19 @@ func (foreach *forEachExpression) writeTo(printer *sqlPrinter) {
 			return
 		}
 
+		printer.sb.WriteString(foreach.el.openTag)
+		for idx := range array {
+			if idx > 0 {
+				printer.sb.WriteString(foreach.el.separatorTag)
+			}
+			foreach.execOne(printer, idx, array[idx])
+		}
+		printer.sb.WriteString(foreach.el.closeTag)
+	case []string:
+		if len(array) == 0 {
+			return
+		}
+
 		printer.sb.WriteString(foreach.el.openTag)
 		for idx := range array {
 			if idx > 0 {
@@ -707,6 +721,23 @@ func (foreach *forEachExpression) writeTo(printer *sqlPrinter) {
 			return
 		}
 
+		printer.sb.WriteString(foreach.el.openTag)
+		isFirst := true
+		for key, value := range array {
+			if isFirst {
+				isFirst = false
+			} else {
+				printer.sb.WriteString(foreach.el.separatorTag)
+			}
+			foreach.execOne(printer, key, value)
+		}
+		printer.sb.WriteString(foreach.el.closeTag)
+
+	case map[string]string:
+		if len(array) == 0 {
+			return
+		}
+
 		printer.sb.WriteString(foreach.el.openTag)
 		isFirst := true
 		for key, value := range array {
@@ -1859,7 +1890,6 @@ type nestParameters struct {
 	values map[string]func(name string) (interface{}, error)
 }
 
-
 func (s nestParameters) RValue(dialect Dialect, param *Param) (interface{}, error) {
 	get, ok := s.values[param.Name]
 	if ok {
@@ -1872,7 +1902,6 @@ func (s nestParameters) RValue(dialect Dialect, param *Param) (interface{}, erro
 	return s.Parameters.RValue(dialect, param)
 }
 
-
 func (s nestParameters) Get(name string) (interface{}, error) {
 	get, ok := s.values[name]
 	if ok {

core/xml_test.go

@@ -537,6 +537,17 @@ func TestXmlOk(t *testing.T) {
 			exceptedSQL:     "aa ($1,$2,$3,$4)",
 			execeptedParams: []interface{}{0, 1, 2, 3},
 		},
+
+		{
+			name:            "foreach array parent scope value",
+			sql:             `aa <foreach collection="aa" index="index" item="item" open="(" separator="," close=")">#{item},#{parentValue}</foreach>`,
+			paramNames:      []string{"aa", "parentValue"},
+			paramValues:     []interface{}{[]interface{}{"a"}, "apr"},
+			exceptedSQL:     "aa ($1,$2)",
+			execeptedParams: []interface{}{"a", "apr"},
+			isUnsortable:    true,
+		},
+
 		{
 			name:            "foreach map index",
 			sql:             `aa <foreach collection="aa" index="index" item="item" open="(" separator="," close=")">#{index}</foreach>`,
@@ -564,6 +575,17 @@ func TestXmlOk(t *testing.T) {
 			execeptedParams: []interface{}{"a", "b", "c", "d"},
 			isUnsortable:    true,
 		},
+
+
+		{
+			name:            "foreach map parent scope value",
+			sql:             `aa <foreach collection="aa" index="index" item="item" open="(" separator="," close=")">#{item},#{parentValue}</foreach>`,
+			paramNames:      []string{"aa", "parentValue"},
+			paramValues:     []interface{}{map[interface{}]interface{}{"1": "a"}, "apr"},
+			exceptedSQL:     "aa ($1,$2)",
+			execeptedParams: []interface{}{"a", "apr"},
+			isUnsortable:    true,
+		},
 		{
 			name:            "choose ok",
 			sql:             `aa <choose><when test="a==1">#{i1}</when></choose>`,

go.mod

@@ -41,6 +41,6 @@ require (
 	golang.org/x/text v0.14.0 // indirect
 )
 
-replace github.com/PaesslerAG/gval v1.2.3-0.20240523111506-121093f3c9a6 => github.com/mei-rune/gval v0.0.0-20240527144442-8679586f671f
+replace github.com/PaesslerAG/gval v1.2.3-0.20240523111506-121093f3c9a6 => github.com/mei-rune/gval  v0.0.0-20240529235637-0d6feecec9dd
 
 go 1.17

go.sum

@@ -983,6 +983,8 @@ github.com/mei-rune/gval v0.0.0-20240523085046-f117dd0bb99e h1:qP7bt3juVmGNgm4b1
 github.com/mei-rune/gval v0.0.0-20240523085046-f117dd0bb99e/go.mod h1:XRFLwvmkTEdYziLdaCeCa5ImcGVrfQbeNUbVR+C6xac=
 github.com/mei-rune/gval v0.0.0-20240527144442-8679586f671f h1:umbNm9qwYFPUAjN5C2Kqxc+mNcN8y0VcI9QDrnfqznM=
 github.com/mei-rune/gval v0.0.0-20240527144442-8679586f671f/go.mod h1:L1IgfJ2H0ZcA7fzZXQyi5paktzqv9/3IYAB4/AYnxL8=
+github.com/mei-rune/gval v0.0.0-20240529235637-0d6feecec9dd h1:+0MLehs+/8lnaJfi1yz6DNU2wKJ32IZV7erAJJBbh9U=
+github.com/mei-rune/gval v0.0.0-20240529235637-0d6feecec9dd/go.mod h1:L1IgfJ2H0ZcA7fzZXQyi5paktzqv9/3IYAB4/AYnxL8=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
 github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=