Tracking bookshelf-page (fix bookshelf-page/bookshelf#1)

anyong · Apr 12, 2016 · 99fea87 · 99fea87
1 parent 8aa1729
commit 99fea87
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/plugins/pagination.js b/src/plugins/pagination.js
@@ -167,8 +167,11 @@ module.exports = function paginationPlugin (bookshelf) {
                     // Remove grouping and ordering. Ordering is unnecessary
                     // for a count, and grouping returns the entire result set
                     // What we want instead is to use `DISTINCT`
+                    _remove(qb._statements, statement => {
+                        return (notNeededQueries.indexOf(statement.type) > -1) ||
+                            statement.grouping === 'columns';
+                    });
                     qb.countDistinct.apply(qb, [`${tableName}.${idAttribute}`]);
-                    _remove(qb._statements, statement => notNeededQueries.indexOf(statement.type) > -1);
                 })
 
                 .fetchAll()

diff --git a/test/integration/plugins/pagination.js b/test/integration/plugins/pagination.js
@@ -66,6 +66,15 @@ module.exports = function (bookshelf) {
           expect(parseInt(m[1].get('id'))).to.equal(4);
         })
       })
+
+      it('fetches a page when other columns are specified on the original query', function () {
+        return Models.Customer.forge().query(function (qb) {
+          qb.column.apply(qb, ['name'])
+        }).fetchPage().then(function (results) {
+          var md = results.pagination;
+          expect(md.rowCount).to.equal(4);
+        })
+      })
     })
 
     describe('Model static fetchPage', function () {