From 5a209f144c2c76b4a2a1f1621f08d297b5f3f11c Mon Sep 17 00:00:00 2001 From: juliengroch Date: Wed, 18 Jan 2017 10:01:55 +0100 Subject: [PATCH] fixe typo --- defaults.go | 4 ++-- option.go | 6 +++--- paginator.go | 4 ++-- stores.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/defaults.go b/defaults.go index b99209b..ae81320 100644 --- a/defaults.go +++ b/defaults.go @@ -13,8 +13,8 @@ const ( // DefaultCursorKeyName is the request cursor key name. DefaultCursorKeyName = "since" - // DefaultCursorBddName is the default cursor bdd field name - DefaultCursorBddName = "id" + // DefaultCursorDBName is the default cursor bdd field name + DefaultCursorDBName = "id" // DefaultCursorStructName is the default cursor struct field name DefaultCursorStructName = "ID" diff --git a/option.go b/option.go index 47ef701..201c9eb 100644 --- a/option.go +++ b/option.go @@ -18,8 +18,8 @@ type Options struct { CursorMode string // CursorKeyName is the query string key name for the offset. CursorKeyName string - // CursorBddName is the cursor bdd field name - CursorBddName string + // CursorDBName is the cursor bdd field name + CursorDBName string // CursorStructName is the cursor struct field name CursorStructName string // CursorReverse turn true to work with DESC request @@ -34,7 +34,7 @@ func NewOptions() *Options { OffsetKeyName: DefaultOffsetKeyName, CursorMode: IDModeCursor, CursorKeyName: DefaultCursorKeyName, - CursorBddName: DefaultCursorBddName, + CursorDBName: DefaultCursorDBName, CursorStructName: DefaultCursorStructName, CursorReverse: false, } diff --git a/paginator.go b/paginator.go index b9148ae..fdc8c02 100644 --- a/paginator.go +++ b/paginator.go @@ -83,7 +83,7 @@ func (p *PaginatorCursor) Page() (interface{}, error) { p.Limit, p.Cursor, &p.Count, - p.Options.CursorBddName, + p.Options.CursorDBName, p.Options.CursorReverse) if err != nil { return nil, err @@ -118,7 +118,7 @@ func (p *PaginatorCursor) Next() (Paginator, error) { paginator.Limit, paginator.Cursor, &paginator.Count, - paginator.Options.CursorBddName, + paginator.Options.CursorDBName, paginator.Options.CursorReverse) if err != nil { return nil, err diff --git a/stores.go b/stores.go index 467f430..c04e062 100644 --- a/stores.go +++ b/stores.go @@ -70,7 +70,7 @@ func (s *GORMStore) PaginateCursor(limit int64, cursor interface{}, count *int64 q = q.Find(s.items) q = q.Limit(-1) - if err := q.Count(count).Error; err != nil { + if err := q.Unscoped().Count(count).Error; err != nil { return err }