fix(query): update total type

glennliao · glennliao · commit 6e026a617b52 · 2022-12-07T18:21:14.000+08:00
diff --git a/action/hook.go b/action/hook.go
@@ -1,6 +1,7 @@
 package action
 
 type Hook struct {
+	// todo 区分 事务内和事务外的hook, 减少事务时长
 	Before func(n *Node, method string) error
 	After  func(n *Node, method string) error
 }
diff --git a/db/sqlexecutor.go b/db/sqlexecutor.go
@@ -282,15 +282,16 @@ func (e *SqlExecutor) column() []string {
 		}
 
 		// 过滤可访问字段
-		if !e.accessVerify || lo.Contains(outFields, dbStyle(e.ctx, tableName, fieldName)) {
+		if !e.accessVerify || lo.Contains(outFields, dbStyle(e.ctx, tableName, fieldName)) ||
+			len(outFields) == 0 /* 数据库中未设置, 则看成全部可访问 */ {
 			fields = append(fields, column)
 		}
 	}
 
 	return fields
 }
 
-func (e *SqlExecutor) List(page int, count int, needTotal bool) (list []g.Map, total int, err error) {
+func (e *SqlExecutor) List(page int, count int, needTotal bool) (list []g.Map, total int64, err error) {
 
 	if e.WithEmptyResult {
 		return nil, 0, err
@@ -299,9 +300,11 @@ func (e *SqlExecutor) List(page int, count int, needTotal bool) (list []g.Map, t
 	m := e.build()
 
 	if needTotal {
-		total, err = m.Count()
-		if err != nil || total == 0 {
+		_total, err := m.Count()
+		if err != nil || _total == 0 {
 			return nil, 0, err
+		} else {
+			total = int64(_total)
 		}
 	}
 
diff --git a/demo/todo/go.mod b/demo/todo/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/glennliao/apijson-go v0.0.0
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.2.1
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.2.2
 	github.com/gogf/gf/v2 v2.2.2
 	github.com/iancoleman/orderedmap v0.2.0
 	github.com/samber/lo v1.33.0
diff --git a/demo/todo/go.sum b/demo/todo/go.sum
@@ -31,8 +31,8 @@ github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.2.1 h1:O3GF8PIuvECnB0BdsJnVNj+KKYfsRpDTDl07rN4uczs=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.2.1/go.mod h1:z+/0qiOwMroAnj5ESuobTv0l5P83rf+XR3r6Fj8WJyk=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.2.2 h1:93FP18bid15qLeWmtAu184u1tp0dctQ06PBrJAyrdbc=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.2.2/go.mod h1:z+/0qiOwMroAnj5ESuobTv0l5P83rf+XR3r6Fj8WJyk=
 github.com/gogf/gf/v2 v2.0.0/go.mod h1:apktt6TleWtCIwpz63vBqUnw8MX8gWKoZyxgDpXFtgM=
 github.com/gogf/gf/v2 v2.2.2 h1:ew4k/VSr/gcPdMZcI8/HZYBYPjB0KOk6bQqA61M8bYE=
 github.com/gogf/gf/v2 v2.2.2/go.mod h1:thvkyb43RWUu/m05sRm4CbH9r7t7/FrW2M56L9Ystwk=
diff --git a/functions/util.go b/functions/util.go
@@ -2,7 +2,7 @@ package functions
 
 import "strings"
 
-// 解析ParseFunctionsStr字符串, 返回函数名和参数列表
+// ParseFunctionsStr 解析ParseFunctionsStr字符串, 返回函数名和参数列表
 func ParseFunctionsStr(funcStr string) (functionsName string, paramKeys []string) {
 	if !strings.Contains(funcStr, "(") { // 无参形式
 		functionsName = funcStr
diff --git a/query/node.go b/query/node.go
@@ -61,7 +61,7 @@ type Node struct {
 
 	primaryTableKey string // 主查询表
 
-	total     int // 数据总条数
+	total     int64 // 数据总条数
 	needTotal bool
 }
 
diff --git a/query/util.go b/query/util.go
@@ -28,7 +28,7 @@ func hasFirstUpKey(m g.Map) bool {
 	return false
 }
 
-// parseTableKey 解析表名
+// parseTableKey 解析表名 //todo 增加一个通用解析key的方法, 避免到处出现判断key后缀以及截取操作
 func parseTableKey(k string, p string) (tableName string) {
 	tableName = k
 
@@ -58,7 +58,7 @@ func parseQueryNodeReq(reqMap g.Map, isList bool) (refMap g.MapStrStr, where g.M
 		} else {
 			if isList {
 				switch k {
-				case "page", "count", "query":
+				case "page", "count", "query": // todo 调整常量
 					// 分页字段不传递到sqlExecutor
 					continue
 				}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package action`
`2`	`2`
`3`	`3`	`type Hook struct {`
	`4`	`+ // todo 区分事务内和事务外的hook, 减少事务时长`
`4`	`5`	`Before func(n *Node, method string) error`
`5`	`6`	`After func(n *Node, method string) error`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,15 +282,16 @@ func (e *SqlExecutor) column() []string {`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`// 过滤可访问字段`
`285`		`- if !e.accessVerify \|\| lo.Contains(outFields, dbStyle(e.ctx, tableName, fieldName)) {`
	`285`	`+ if !e.accessVerify \|\| lo.Contains(outFields, dbStyle(e.ctx, tableName, fieldName)) \|\|`
	`286`	`+ len(outFields) == 0 /* 数据库中未设置, 则看成全部可访问 */ {`
`286`	`287`	`fields = append(fields, column)`
`287`	`288`	`}`
`288`	`289`	`}`
`289`	`290`
`290`	`291`	`return fields`
`291`	`292`	`}`
`292`	`293`
`293`		`-func (e *SqlExecutor) List(page int, count int, needTotal bool) (list []g.Map, total int, err error) {`
	`294`	`+func (e *SqlExecutor) List(page int, count int, needTotal bool) (list []g.Map, total int64, err error) {`
`294`	`295`
`295`	`296`	`if e.WithEmptyResult {`
`296`	`297`	`return nil, 0, err`
`@@ -299,9 +300,11 @@ func (e *SqlExecutor) List(page int, count int, needTotal bool) (list []g.Map, t`
`299`	`300`	`m := e.build()`
`300`	`301`
`301`	`302`	`if needTotal {`
`302`		`- total, err = m.Count()`
`303`		`- if err != nil \|\| total == 0 {`
	`303`	`+ _total, err := m.Count()`
	`304`	`+ if err != nil \|\| _total == 0 {`
`304`	`305`	`return nil, 0, err`
	`306`	`+ } else {`
	`307`	`+ total = int64(_total)`
`305`	`308`	`}`
`306`	`309`	`}`
`307`	`310`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ type Node struct {`
`61`	`61`
`62`	`62`	`primaryTableKey string // 主查询表`
`63`	`63`
`64`		`- total int // 数据总条数`
	`64`	`+ total int64 // 数据总条数`
`65`	`65`	`needTotal bool`
`66`	`66`	`}`
`67`	`67`