Merge pull request pallets-eco#101 from snotling/master

mitsuhiko · mitsuhiko · commit 4bcd2337f505 · 2013-01-26T17:25:29.000-08:00
Pagination count() query should remove ORDER BY clause(s)
diff --git a/flask_sqlalchemy.py b/flask_sqlalchemy.py
@@ -385,7 +385,7 @@ def paginate(self, page, per_page=20, error_out=True):
         items = self.limit(per_page).offset((page - 1) * per_page).all()
         if not items and page != 1 and error_out:
             abort(404)
-        return Pagination(self, page, per_page, self.count(), items)
+        return Pagination(self, page, per_page, self.order_by(None).count(), items)
 
 
 class _QueryProperty(object):
