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

CoburnJoe · web-flow · commit 4609f6e20e7e · 2020-04-01T12:04:00.000+01:00
Fixed bug with duplicate results and counting
diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
@@ -498,12 +498,7 @@ 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.
-        if page == 1 and len(items) < per_page:
-            total = len(items)
-        else:
-            total = self.order_by(None).count()
+        total = self.order_by(None).count()
 
         return Pagination(self, page, per_page, total, items)
 
