page和pageSize使用int64类型代替int

Author: xfali

builder.go

@@ -9,83 +9,83 @@ package pagehelper
 import "context"
 
 type builder struct {
-    page  PageInfo
-    order OrderByInfo
+	page  PageInfo
+	order OrderByInfo
 
-    ctx context.Context
+	ctx context.Context
 }
 
-//创建builder
-//ctx 初始context
+// 创建builder
+// ctx 初始context
 func C(ctx context.Context) *builder {
-    return &builder{ctx: ctx}
+	return &builder{ctx: ctx}
 }
 
-//分页
-//page 页码
-//pageSize 分页大小
-func (b *builder) Page(page, pageSize int) *builder {
-    b.page.Page = page
-    b.page.PageSize = pageSize
-    b.page.total = 0
-    return b
+// 分页
+// page 页码
+// pageSize 分页大小
+func (b *builder) Page(page, pageSize int64) *builder {
+	b.page.Page = page
+	b.page.PageSize = pageSize
+	b.page.total = 0
+	return b
 }
 
-//分页
-//page 页码
-//pageSize 分页大小
-func (b *builder) PageWithCount(page, pageSize int, countColumn string) *builder {
-    b.page.Page = page
-    b.page.PageSize = pageSize
-    b.page.countColumn = countColumn
-    b.page.total = -1
-    return b
+// 分页
+// page 页码
+// pageSize 分页大小
+func (b *builder) PageWithCount(page, pageSize int64, countColumn string) *builder {
+	b.page.Page = page
+	b.page.PageSize = pageSize
+	b.page.countColumn = countColumn
+	b.page.total = -1
+	return b
 }
 
 func (b *builder) Count(countColumn string) *builder {
-    b.page.countColumn = countColumn
-    b.page.total = -1
-    return b
+	b.page.countColumn = countColumn
+	b.page.total = -1
+	return b
 }
 
-//手动指定字段和排序
-//field 字段
-//order 排序 [ASC | DESC]
+// 手动指定字段和排序
+// field 字段
+// order 排序 [ASC | DESC]
 func (b *builder) OrderBy(field, order string) *builder {
-    b.order.Field = field
-    b.order.Order = order
-    return b
+	b.order.Field = field
+	b.order.Order = order
+	return b
 }
 
-//升序（默认）
-//field 字段
+// 升序（默认）
+// field 字段
 func (b *builder) ASC(field string) *builder {
-    return b.OrderBy(field, ASC)
+	return b.OrderBy(field, ASC)
 }
 
-//降序
-//field 字段
+// 降序
+// field 字段
 func (b *builder) DESC(field string) *builder {
-    return b.OrderBy(field, DESC)
+	return b.OrderBy(field, DESC)
 }
 
-//获得含分页/排序信息的context
+// 获得含分页/排序信息的context
 func (b *builder) Build() context.Context {
-    if b.page.PageSize > 0 {
-        if b.page.total != -1 {
-            b.ctx = StartPage(b.ctx, b.page.Page, b.page.PageSize)
-        } else {
-            b.ctx = StartPageWithCount(b.ctx, b.page.Page, b.page.PageSize, b.page.countColumn)
-        }
-    }
+	if b.page.PageSize > 0 {
+		if b.page.total != -1 {
+			b.ctx = StartPage(b.ctx, b.page.Page, b.page.PageSize)
+		} else {
+			b.ctx = StartPageWithCount(b.ctx, b.page.Page, b.page.PageSize, b.page.countColumn)
+		}
+	}
 
-    if b.order.Field != "" {
-        if b.order.Order == "" {
-            b.order.Order = ASC
-        }
+	if b.order.Field != "" {
+		if b.order.Order == "" {
+			b.order.Order = ASC
+		}
 
-        b.ctx = OrderBy(b.ctx, b.order.Field, b.order.Order)
-    }
+		b.ctx = OrderBy(b.ctx, b.order.Field, b.order.Order)
+	}
 
-    return b.ctx
+	return b.ctx
 }

factory.go

@@ -7,37 +7,37 @@
 package pagehelper
 
 import (
-    "github.com/xfali/gobatis/executor"
-    "github.com/xfali/gobatis/logging"
-    "github.com/xfali/gobatis/session"
-    "github.com/xfali/gobatis/transaction"
+	"github.com/xfali/gobatis/executor"
+	"github.com/xfali/gobatis/logging"
+	"github.com/xfali/gobatis/session"
+	"github.com/xfali/gobatis/transaction"
 )
 
 type IFactory struct {
-    InitDBFunc            func() error
-    CreateTransactionFunc func() transaction.Transaction
-    CreateExecutorFunc    func(transaction.Transaction) executor.Executor
-    CreateSessionFunc     func() session.SqlSession
-    LogFuncFunc           func() logging.LogFunc
+	InitDBFunc            func() error
+	CreateTransactionFunc func() transaction.Transaction
+	CreateExecutorFunc    func(transaction.Transaction) executor.Executor
+	CreateSessionFunc     func() session.SqlSession
+	LogFuncFunc           func() logging.LogFunc
 }
 
 func (f *IFactory) InitDB() error {
-    return f.InitDBFunc()
+	return f.InitDBFunc()
 }
 
 func (f *IFactory) CreateTransaction() transaction.Transaction {
-    return f.CreateTransactionFunc()
+	return f.CreateTransactionFunc()
 }
 
 func (f *IFactory) CreateSession() session.SqlSession {
-    tx := f.CreateTransactionFunc()
-    return session.NewDefaultSqlSession(f.LogFuncFunc(), tx, f.CreateExecutorFunc(tx), false)
+	tx := f.CreateTransactionFunc()
+	return session.NewDefaultSqlSession(f.LogFuncFunc(), tx, f.CreateExecutorFunc(tx), false)
 }
 
 func (f *IFactory) LogFunc() logging.LogFunc {
-    return f.LogFuncFunc()
+	return f.LogFuncFunc()
 }
 
 func (f *IFactory) CreateExecutor(transaction transaction.Transaction) executor.Executor {
-    return f.CreateExecutorFunc(transaction)
+	return f.CreateExecutorFunc(transaction)
 }

modifier.go

@@ -6,33 +6,33 @@
 package pagehelper
 
 const (
-    DriverDummy     = "default"
-    DriverMysql     = "mysql"
-    DriverPostgre   = "postgre"
-    DriverOracle    = "oracle"
-    DriverSqlServer = "sqlserver"
+	DriverDummy     = "default"
+	DriverMysql     = "mysql"
+	DriverPostgre   = "postgre"
+	DriverOracle    = "oracle"
+	DriverSqlServer = "sqlserver"
 )
 
 type Modifier struct {
-    OrderBy func(sql string, p *OrderByInfo) string
-    Page    func(sql string, p *PageInfo) string
-    Count   func(sql, countColumn string) string
+	OrderBy func(sql string, p *OrderByInfo) string
+	Page    func(sql string, p *PageInfo) string
+	Count   func(sql, countColumn string) string
 }
 
 var DummyModifier = Modifier{
-    OrderBy: DummyModifyOrderBy,
-    Page:    DummyModifyPage,
-    Count:   DummyModifyCount,
+	OrderBy: DummyModifyOrderBy,
+	Page:    DummyModifyPage,
+	Count:   DummyModifyCount,
 }
 
 func DummyModifyOrderBy(sql string, p *OrderByInfo) string {
-    return sql
+	return sql
 }
 
 func DummyModifyPage(sql string, p *PageInfo) string {
-    return sql
+	return sql
 }
 
 func DummyModifyCount(sql, countColumn string) string {
-    return sql
+	return sql
 }

modifier_mysql.go

@@ -6,44 +6,44 @@
 package pagehelper
 
 import (
-    "fmt"
-    "strings"
+	"fmt"
+	"strings"
 )
 
 var MysqlModifier = Modifier{
-    OrderBy: MysqlModifyOrderBy,
-    Page:    MysqlModifyPage,
-    Count:   MysqlModifyCount,
+	OrderBy: MysqlModifyOrderBy,
+	Page:    MysqlModifyPage,
+	Count:   MysqlModifyCount,
 }
 
 func MysqlModifyOrderBy(sql string, p *OrderByInfo) string {
-    if p.Field == "" {
-        return sql
-    }
-    b := strings.Builder{}
-    b.WriteString(strings.TrimSpace(sql))
-    b.WriteString(fmt.Sprintf(" ORDER BY `%s` %s ", p.Field, p.Order))
-    return b.String()
+	if p.Field == "" {
+		return sql
+	}
+	b := strings.Builder{}
+	b.WriteString(strings.TrimSpace(sql))
+	b.WriteString(fmt.Sprintf(" ORDER BY `%s` %s ", p.Field, p.Order))
+	return b.String()
 }
 
 func MysqlModifyPage(sql string, p *PageInfo) string {
-    b := strings.Builder{}
-    b.WriteString(strings.TrimSpace(sql))
-    b.WriteString(fmt.Sprintf(" LIMIT %d, %d ", p.Page*p.PageSize, p.PageSize))
-    return b.String()
+	b := strings.Builder{}
+	b.WriteString(strings.TrimSpace(sql))
+	b.WriteString(fmt.Sprintf(" LIMIT %d, %d ", p.Page*p.PageSize, p.PageSize))
+	return b.String()
 }
 
 func MysqlModifyCount(sql, countColumn string) string {
-    if countColumn == "" {
-        countColumn = "0"
-    } else {
-        countColumn = "`" + countColumn + "`"
-    }
-    b := strings.Builder{}
-    b.WriteString("SELECT COUNT(")
-    b.WriteString(countColumn)
-    b.WriteString(") FROM (")
-    b.WriteString(strings.TrimSpace(sql))
-    b.WriteString(") AS __hp_tempCountTl")
-    return b.String()
+	if countColumn == "" {
+		countColumn = "0"
+	} else {
+		countColumn = "`" + countColumn + "`"
+	}
+	b := strings.Builder{}
+	b.WriteString("SELECT COUNT(")
+	b.WriteString(countColumn)
+	b.WriteString(") FROM (")
+	b.WriteString(strings.TrimSpace(sql))
+	b.WriteString(") AS __hp_tempCountTl")
+	return b.String()
 }

modifier_oracle.go

@@ -6,47 +6,47 @@
 package pagehelper
 
 import (
-    "fmt"
-    "strings"
+	"fmt"
+	"strings"
 )
 
 var OracleModifier = Modifier{
-    OrderBy: OracleModifyOrderBy,
-    Page:    OracleModifyPage,
-    Count:   OracleModifyCount,
+	OrderBy: OracleModifyOrderBy,
+	Page:    OracleModifyPage,
+	Count:   OracleModifyCount,
 }
 
 func OracleModifyOrderBy(sql string, p *OrderByInfo) string {
-    if p.Field == "" {
-        return sql
-    }
-    b := strings.Builder{}
-    b.WriteString(strings.TrimSpace(sql))
-    b.WriteString(fmt.Sprintf(" ORDER BY `%s` %s ", p.Field, p.Order))
-    return b.String()
+	if p.Field == "" {
+		return sql
+	}
+	b := strings.Builder{}
+	b.WriteString(strings.TrimSpace(sql))
+	b.WriteString(fmt.Sprintf(" ORDER BY `%s` %s ", p.Field, p.Order))
+	return b.String()
 }
 
 func OracleModifyPage(sql string, p *PageInfo) string {
-    b := strings.Builder{}
-    b.WriteString("SELECT * FROM ( ")
-    b.WriteString(" SELECT __hp_tempPageTl.*, ROWNUM ROW_ID FROM ( ")
-    b.WriteString(strings.TrimSpace(sql))
-    b.WriteString(" ) __hp_tempPageTl)")
-    b.WriteString(fmt.Sprintf(" WHERE ROW_ID <= %d AND ROW_ID > %d ", p.Page*p.PageSize, p.PageSize))
-    return b.String()
+	b := strings.Builder{}
+	b.WriteString("SELECT * FROM ( ")
+	b.WriteString(" SELECT __hp_tempPageTl.*, ROWNUM ROW_ID FROM ( ")
+	b.WriteString(strings.TrimSpace(sql))
+	b.WriteString(" ) __hp_tempPageTl)")
+	b.WriteString(fmt.Sprintf(" WHERE ROW_ID <= %d AND ROW_ID > %d ", p.Page*p.PageSize, p.PageSize))
+	return b.String()
 }
 
 func OracleModifyCount(sql, countColumn string) string {
-    if countColumn == "" {
-        countColumn = "0"
-    } else {
-        countColumn = "`" + countColumn + "`"
-    }
-    b := strings.Builder{}
-    b.WriteString("SELECT COUNT(")
-    b.WriteString(countColumn)
-    b.WriteString(") FROM (")
-    b.WriteString(strings.TrimSpace(sql))
-    b.WriteString(") AS __hp_tempCountTl")
-    return b.String()
+	if countColumn == "" {
+		countColumn = "0"
+	} else {
+		countColumn = "`" + countColumn + "`"
+	}
+	b := strings.Builder{}
+	b.WriteString("SELECT COUNT(")
+	b.WriteString(countColumn)
+	b.WriteString(") FROM (")
+	b.WriteString(strings.TrimSpace(sql))
+	b.WriteString(") AS __hp_tempCountTl")
+	return b.String()
 }