format result for easier extension

Author: ColdWaterLW

ast/mappers.go

@@ -43,22 +43,30 @@ func (s *Mappers) GetStmts(skipErrorQuery bool) ([]string, error) {
 	return stmts, nil
 }
 
-func (s *Mappers) GetStmtsWithFilePath(skipErrorQuery bool) (map[string] /*file path*/ []string /*sqls*/, error) {
+type StmtsInfo struct {
+	FilePath string
+	SQLs     []string
+}
+
+func (s *Mappers) GetStmtsWithFilePath(skipErrorQuery bool) ([]StmtsInfo, error) {
 	ctx := NewContext()
 	for _, m := range s.mappers {
 		for id, node := range m.SqlNodes {
 			ctx.Sqls[fmt.Sprintf("%v.%v", m.NameSpace, id)] = node
 		}
 	}
 
-	stmts := make(map[string][]string, 0)
+	var stmts []StmtsInfo
 	for _, m := range s.mappers {
 		ctx.DefaultNamespace = m.NameSpace
 		stmt, err := m.GetStmts(ctx, skipErrorQuery)
 		if err != nil {
 			return nil, fmt.Errorf("get sqls from mapper failed, namespace: %v, err: %v", m.NameSpace, err)
 		}
-		stmts[m.FilePath] = append(stmts[m.FilePath], stmt...)
+		stmts = append(stmts, StmtsInfo{
+			FilePath: m.FilePath,
+			SQLs:     stmt,
+		})
 	}
 	return stmts, nil
 }

parser.go

@@ -76,7 +76,7 @@ type XmlFiles struct {
 
 // ParseXMLsWithFilePath is a parser for parse all query in several XML files to map[string][]string one by one;
 // you can set `skipErrorQuery` true to ignore invalid query.
-func ParseXMLsWithFilePath(dataFromFiles []XmlFiles, skipErrorQuery bool) (map[string] /*file path*/ []string /*sqls*/, error) {
+func ParseXMLsWithFilePath(dataFromFiles []XmlFiles, skipErrorQuery bool) ([]ast.StmtsInfo, error) {
 	ms := ast.NewMappers()
 	for _, data := range dataFromFiles {
 		r := strings.NewReader(data.Content)