db/lib/sqlbuilder: ignore order when counting

Author: xiam

Diff for: lib/sqlbuilder/paginate.go

@@ -39,7 +39,11 @@ func newPaginator(sel Selector, pageSize uint) Paginator {
 
 func (pq *paginatorQuery) count() (uint64, error) {
 	var count uint64
-	row, err := pq.sel.(*selector).setColumns(db.Raw("count(1) AS _t")).Limit(0).Offset(0).QueryRow()
+	row, err := pq.sel.(*selector).setColumns(db.Raw("count(1) AS _t")).
+		Limit(0).
+		Offset(0).
+		OrderBy(nil).
+		QueryRow()
 
 	err = row.Scan(&count)
 	if err != nil {

Diff for: lib/sqlbuilder/select.go

@@ -242,6 +242,13 @@ func (sel *selector) GroupBy(columns ...interface{}) Selector {
 
 func (sel *selector) OrderBy(columns ...interface{}) Selector {
 	return sel.frame(func(sq *selectorQuery) error {
+
+		if len(columns) == 1 && columns[0] == nil {
+			sq.orderBy = nil
+			sq.orderByArgs = nil
+			return nil
+		}
+
 		var sortColumns exql.SortColumns
 
 		for i := range columns {