增加xml <if>中<foreach>支持

Author: xfali

parsing/xml/dynamics.go

@@ -45,8 +45,9 @@ type Include struct {
 }
 
 type If struct {
-	Test string `xml:"test,attr"`
-	Data string `xml:",chardata"`
+	Foreach Foreach `xml:"foreach"`
+	Test    string  `xml:"test,attr"`
+	Data    string  `xml:",chardata"`
 }
 
 type Where struct {
@@ -87,22 +88,27 @@ func (de *If) Format(getFunc func(key string) string) string {
 		return ""
 	}
 
+	data := ""
+	if de.Foreach.Data != "" {
+	    data = strings.TrimSpace(de.Foreach.Format(getFunc))
+    }
+	data += strings.TrimSpace(de.Data)
 	if len(andStrs) != 0 && len(orStrs) < 2 {
 		for _, v := range andStrs {
 			ret := Compare(v, getFunc)
 			if ret != true {
 				return ""
 			}
 		}
-		return strings.TrimSpace(de.Data)
+		return data
 	}
 
 	ret := false
 	if len(orStrs) != 0 {
 		for _, v := range orStrs {
 			ret = Compare(v, getFunc)
 			if ret == true {
-				return strings.TrimSpace(de.Data)
+				return data
 			}
 		}
 		if ret == false {

test/xmlparse_test.go

@@ -451,3 +451,37 @@ func TestXmlDynamicForeach3(t *testing.T) {
 
 	})
 }
+
+func TestXmlDynamicIfForeach(t *testing.T) {
+	src := `INSERT INTO TEST_TABLE(id, username, password) VALUES
+		<if test="{0} != nil">
+			<foreach item="item" index="index" collection="{0}"
+				open="" separator="," close="">
+				(#{item.testParseStruct.Username}, #{item.testParseStruct.Password})
+			</foreach>
+		</if>
+`
+	logging.SetLevel(logging.DEBUG)
+	m, err := xml.ParseDynamic(src, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Run("foreach first", func(t *testing.T) {
+		params := []testParseStruct{
+			{
+				Username: "user1",
+				Password: "pw1",
+			},
+			{
+				Username: "user2",
+				Password: "pw2",
+			},
+		}
+		ret, err := m.ParseMetadata("mysql", params)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Logf("arg first : %s\n", ret)
+
+	})
+}