added max_per_page param to pagination

pallets-eco · Sep 21, 2017 · 3aed53a · 3aed53a
1 parent 5ad6cdb
commit 3aed53a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
@@ -429,7 +429,7 @@ def first_or_404(self):
             abort(404)
         return rv
 
-    def paginate(self, page=None, per_page=None, error_out=True):
+    def paginate(self, page=None, per_page=None, error_out=True, max_per_page=None):
         """Returns ``per_page`` items from page ``page``.
 
         If no items are found and ``page`` is greater than 1, or if page is
@@ -465,7 +465,8 @@ def paginate(self, page=None, per_page=None, error_out=True):
 
                     per_page = 20
                 else:
-                    per_page = min(per_page, 20)
+                    if max_per_page is not None:
+                        per_page = min(per_page, max_per_page)
         else:
             if page is None:
                 page = 1

diff --git a/tests/test_pagination.py b/tests/test_pagination.py
@@ -50,7 +50,7 @@ def test_query_paginate_more_than_20(app, db, Todo):
 
     @app.route('/')
     def index():
-        p = Todo.query.paginate()
+        p = Todo.query.paginate(max_per_page=20)
         return '{0} items retrieved'.format(len(p.items))
 
     c = app.test_client()