Limiter and Sorter should return ready-to-use values

mongox/query/limit.go

@@ -2,16 +2,21 @@ package query
 
 // Limiter is a filter to limit the result
 type Limiter interface {
-	Limit() int
+	Limit() *int64
 }
 
 // Limit is a simple implementation of the Limiter filter
-type Limit int
+type Limit int64
 
 var _ Limiter = Limit(0)
 
 // Limit returns a limit
-func (l Limit) Limit() int {
+func (l Limit) Limit() *int64 {
 
-	return int(l)
+	lim := int64(l)
+	if lim <= 0 {
+		return nil
+	}
+
+	return &lim
 }

mongox/query/query.go

@@ -32,16 +32,24 @@ func (q *Query) And(elem bson.M) *Query {
 	return q
 }
 
-// Limiter is a limit function for a query
-func (q *Query) Limiter() Limiter {
+// Limiter returns limiter value or nil
+func (q *Query) Limiter() *int64 {
 
-	return q.limiter
+	if q.limiter == nil {
+		return nil
+	}
+
+	return q.limiter.Limit()
 }
 
 // Sorter is a sort rule for a query
-func (q *Query) Sorter() Sorter {
+func (q *Query) Sorter() interface{} {
 
-	return q.sorter
+	if q.sorter == nil {
+		return nil
+	}
+
+	return q.sorter.Sort()
 }
 
 // Empty checks the query for any content
@@ -55,6 +63,5 @@ func (q *Query) Empty() bool {
 
 // M returns underlying query map
 func (q *Query) M() bson.M {
-
 	return q.m
 }