修改测试用例

Author: xfali

builder.go

@@ -42,7 +42,7 @@ func (b *builder) PageWithCount(page, pageSize int, countColumn string) *builder
     return b
 }
 
-func (b *builder) Total(countColumn string) *builder {
+func (b *builder) Count(countColumn string) *builder {
     b.page.countColumn = countColumn
     b.page.total = -1
     return b

pagehelper.go

@@ -10,6 +10,7 @@ package pagehelper
 
 import (
     "context"
+    "fmt"
 )
 
 type OrderByInfo struct {
@@ -100,3 +101,7 @@ func (p *PageInfo) GetTotalPage() int64 {
 
     return (p.total + int64(p.PageSize) - 1) / int64(p.PageSize)
 }
+
+func (p *PageInfo) String() string {
+    return fmt.Sprintf("pageNum: %d , pageSize: %d , Total: %d , TotalPage: %d", p.GetPageNum(), p.GetPageSize(), p.GetTotal(), p.GetTotalPage())
+}

pagehelper_test.go

@@ -10,6 +10,7 @@ package pagehelper
 
 import (
     "context"
+    _ "github.com/go-sql-driver/mysql"
     "github.com/xfali/gobatis"
     "github.com/xfali/gobatis/datasource"
     "strings"
@@ -105,8 +106,8 @@ func TestPageHelper2(t *testing.T) {
             Host:     "localhost",
             Port:     3306,
             DBName:   "test",
-            Username: "root",
-            Password: "123",
+            Username: "test",
+            Password: "test",
             Charset:  "utf8",
         })))
     sessMgr := gobatis.NewSessionManager(pFac)
@@ -117,7 +118,35 @@ func TestPageHelper2(t *testing.T) {
     session.SetContext(ctx)
 
     var ret []TestTable
-    session.Select("SELECT * FROM TBL_TEST").Param().Result(&ret)
+    session.Select("SELECT * FROM test_table").Param().Result(&ret)
+
+    t.Log(ret)
+}
+
+func TestPageHelper3(t *testing.T) {
+    pFac := New(gobatis.NewFactory(
+        gobatis.SetMaxConn(100),
+        gobatis.SetMaxIdleConn(50),
+        gobatis.SetDataSource(&datasource.MysqlDataSource{
+            Host:     "localhost",
+            Port:     3306,
+            DBName:   "test",
+            Username: "test",
+            Password: "test",
+            Charset:  "utf8",
+        })))
+    sessMgr := gobatis.NewSessionManager(pFac)
+    session := sessMgr.NewSession()
+    ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
+    ctx = C(ctx).Page(1, 2).Count("").ASC("id").Build()
+
+    session.SetContext(ctx)
+
+    var ret []TestTable
+    session.Select("SELECT * FROM test_table").Param().Result(&ret)
+
+    t.Log(ret)
+    t.Log(GetPageInfo(session.GetContext()))
 }
 
 func TestModifyPage(t *testing.T) {

test/builder_test.go

@@ -41,7 +41,7 @@ func TestBuilder2(t *testing.T) {
 
 func TestBuilder3(t *testing.T) {
     ctx := pagehelper.C(context.Background()).Page(1, 3).Order("test", pagehelper.ASC).Build()
-    ctx = pagehelper.C(ctx).DESC("new_field").ASC("new_field2").Total("test").Page(2,100).Build()
+    ctx = pagehelper.C(ctx).DESC("new_field").ASC("new_field2").Count("test").Page(2,100).Build()
     ctx, _ = context.WithTimeout(ctx, time.Second)
     p := ctx.Value(pageHelperValue)
     o := ctx.Value(orderHelperValue)