Merge pull request pallets-eco#804 from CoburnJoe/patch-1

CoburnJoe · web-flow · commit 706982bb8a09 · 2020-02-25T22:20:30.000Z
Removed conditional count from pagination
diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
@@ -499,13 +499,8 @@ def paginate(self, page=None, per_page=None, error_out=True, max_per_page=None,
         if not items and page != 1 and error_out:
             abort(404)
 
-        # No need to count if we're on the first page and there are fewer
-        # items than we expected or if count is disabled.
-
         if not count:
             total = None
-        elif page == 1 and len(items) < per_page:
-            total = len(items)
         else:
             total = self.order_by(None).count()
 
