make it easy to extend the struct

Author: ColdWaterLW

ast/mappers.go

@@ -23,50 +23,32 @@ func (s *Mappers) AddMapper(ms ...*Mapper) error {
 	return nil
 }
 
-func (s *Mappers) GetStmts(skipErrorQuery bool) ([]string, error) {
-	ctx := NewContext()
-	stmts := []string{}
-	for _, m := range s.mappers {
-		for id, node := range m.SqlNodes {
-			ctx.Sqls[fmt.Sprintf("%v.%v", m.NameSpace, id)] = node
-		}
-	}
-
-	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 = append(stmts, stmt...)
-	}
-	return stmts, nil
-}
-
-type StmtsInfo struct {
+type StmtInfo struct {
 	FilePath string
-	SQLs     []string
+	SQL      string
 }
 
-func (s *Mappers) GetStmtsWithFilePath(skipErrorQuery bool) ([]StmtsInfo, error) {
+func (s *Mappers) GetStmts(skipErrorQuery bool) ([]StmtInfo, error) {
 	ctx := NewContext()
+	stmts := []StmtInfo{}
 	for _, m := range s.mappers {
 		for id, node := range m.SqlNodes {
 			ctx.Sqls[fmt.Sprintf("%v.%v", m.NameSpace, id)] = node
 		}
 	}
 
-	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 = append(stmts, StmtsInfo{
-			FilePath: m.FilePath,
-			SQLs:     stmt,
-		})
+		for _, sql := range stmt {
+			stmts = append(stmts, StmtInfo{
+				FilePath: m.FilePath,
+				SQL:      sql,
+			})
+		}
 	}
 	return stmts, nil
 }

parser.go

@@ -28,57 +28,16 @@ func ParseXML(data string) (string, error) {
 	return stmt, nil
 }
 
-// ParseXMLs is a parser for parse all query in several XML files to []string one by one;
-// you can set `skipErrorQuery` true to ignore invalid query.
-func ParseXMLs(data []string, skipErrorQuery bool) ([]string, error) {
-	ms := ast.NewMappers()
-	for i := range data {
-		r := strings.NewReader(data[i])
-		d := xml.NewDecoder(r)
-		n, err := parse(d)
-		if err != nil {
-			if skipErrorQuery {
-				continue
-			} else {
-				return nil, err
-			}
-		}
-
-		if n == nil {
-			continue
-		}
-
-		m, ok := n.(*ast.Mapper)
-		if !ok {
-			if skipErrorQuery {
-				continue
-			} else {
-				return nil, errors.New("the mapper is not found")
-			}
-		}
-		err = ms.AddMapper(m)
-		if err != nil && !skipErrorQuery {
-			return nil, fmt.Errorf("add mapper failed: %v", err)
-		}
-	}
-	stmts, err := ms.GetStmts(skipErrorQuery)
-	if err != nil {
-		return nil, err
-	}
-
-	return stmts, nil
-}
-
-type XmlFiles struct {
+type XmlFile struct {
 	FilePath string
 	Content  string
 }
 
-// ParseXMLsWithFilePath is a parser for parse all query in several XML files to map[string][]string one by one;
+// ParseXMLs is a parser for parse all query in several XML files to []ast.StmtInfo one by one;
 // you can set `skipErrorQuery` true to ignore invalid query.
-func ParseXMLsWithFilePath(dataFromFiles []XmlFiles, skipErrorQuery bool) ([]ast.StmtsInfo, error) {
+func ParseXMLs(data []XmlFile, skipErrorQuery bool) ([]ast.StmtInfo, error) {
 	ms := ast.NewMappers()
-	for _, data := range dataFromFiles {
+	for _, data := range data {
 		r := strings.NewReader(data.Content)
 		d := xml.NewDecoder(r)
 		n, err := parse(d)
@@ -108,7 +67,7 @@ func ParseXMLsWithFilePath(dataFromFiles []XmlFiles, skipErrorQuery bool) ([]ast
 			return nil, fmt.Errorf("add mapper failed: %v", err)
 		}
 	}
-	stmts, err := ms.GetStmtsWithFilePath(skipErrorQuery)
+	stmts, err := ms.GetStmts(skipErrorQuery)
 	if err != nil {
 		return nil, err
 	}