optimize SQLQuery.AllQuery() logic return sorted *Query list

core.go

@@ -37,6 +37,12 @@ type Query struct {
 	Tags  map[string]string
 }
 
+// QueryList query list
+type QueryList []*Query
+
+// QueryMap is a map associating a Tag to its Query
+type QueryMap map[string]*Query
+
 func (q *Query) PrepareStyle() string {
 	prepareStyle := PrepareStyleStmt
 	if style, exist := q.Tags["prepare"]; exist {
@@ -51,8 +57,17 @@ func (q *Query) PrepareStyle() string {
 	return prepareStyle
 }
 
-// QueryMap is a map associating a Tag to its Query
-type QueryMap map[string]*Query
+func (q QueryList) Len() int {
+	return len(q)
+}
+
+func (q QueryList) Less(i, j int) bool {
+	return q[i].Scope+"_"+q[i].Name < q[j].Scope+"_"+q[j].Name
+}
+
+func (q QueryList) Swap(i, j int) {
+	q[i], q[j] = q[j], q[i]
+}
 
 func (q QueryMap) FilterByStyle(style string) QueryMap {
 	qm := make(QueryMap, len(q))
@@ -94,7 +109,7 @@ type SQLQuery interface {
 	ListScope() ScopeQuery
 
 	// AllQuery get all *Query list
-	AllQuery() []*Query
+	AllQuery() QueryList
 }
 
 // SQLParser sql file parser interface

examples/Makefile

@@ -8,11 +8,6 @@ default: run
 run:
 	go run gen.go
 
-.PHONY: mod-tidy
-mod-tidy:
-	@go mod download
-	@go mod tidy
-
 .PHONY: generate
 generate:
 	@go generate gen.go

examples/go.mod

@@ -2,7 +2,7 @@ module github.com/alimy/yesql/examples
 
 go 1.18
 
-require github.com/alimy/yesql v1.1.2
+require github.com/alimy/yesql v1.1.6
 
 require github.com/jmoiron/sqlx v1.3.5
 

parser.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"regexp"
+	"sort"
 	"strings"
 )
 
@@ -71,8 +72,8 @@ func (s *sqlParser) ListScope() ScopeQuery {
 	return s.scopeQuery
 }
 
-func (s *sqlParser) AllQuery() []*Query {
-	allQuery := make([]*Query, 0, len(s.queryMap))
+func (s *sqlParser) AllQuery() QueryList {
+	allQuery := make(QueryList, 0, len(s.queryMap))
 	for _, query := range s.queryMap {
 		allQuery = append(allQuery, query)
 	}
@@ -81,6 +82,7 @@ func (s *sqlParser) AllQuery() []*Query {
 			allQuery = append(allQuery, query)
 		}
 	}
+	sort.Sort(allQuery)
 	return allQuery
 }
 

version.go

@@ -1,3 +1,3 @@
 package yesql
 
-var Version = "v1.1.5"
+var Version = "v1.1.6"