Changeset 3846

Timestamp:

12/24/07 10:00:49 (7 months ago)

Author:

roger

Message:

Fix #1641.

Files:

• branches/1.1/CHANGELOG.txt (modified) (1 diff)
• branches/1.1/turbogears/paginate.py (modified) (2 diffs)
• branches/1.1/turbogears/tests/test_paginate.py (modified) (2 diffs)

branches/1.1/CHANGELOG.txt

@@ -43 +43 @@
-* Paginate does a better handling of zeroed limit, avoiding ZeroDivisionError
-  exception (#1629).
-
-
-
-
-
+
+
+
+
+
+
-
-

branches/1.1/turbogears/paginate.py

@@ -161 +161 @@
-                else:
-                    df = default_order
-
+
-                ordering = dict([(v.lstrip('-'), [k, not v.startswith('-')])
-                                 for k,v in enumerate(df)])
@@ -172 +172 @@
-               (SASelectResults and isinstance(var_data, SASelectResults)) or \
-               (Query and isinstance(var_data, Query)):
-
+ or 0
-                if ordering:
-                    # Build order_by list.

branches/1.1/turbogears/tests/test_paginate.py

@@ -619 +619 @@
-        zero_limit = expose("turbogears.tests.paginate")(zero_limit)
-
+        def empty_with_groupby(self):
+            data = session.query(Address).filter(Address.c.id<0).group_by(Address.c.user_id)
+
+            spy = Spy(var_name='data', pages=[], limit=10, page_count=0,
+                      order=None, row_count=0)
+            return dict(data=data, spy=spy)
+
+        empty_with_groupby = paginate("data", default_order="id")(empty_with_groupby)
+        empty_with_groupby = expose("turbogears.tests.paginate")(empty_with_groupby)
+
-    # end of MyRoot ------------------------------------------------------------
-
@@ -895 +905 @@
-            self.request("/zero_limit/?method=%s" % method)
-            self.assert_order(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)
+
+    def test_ticket_1641(self):
+        self.request("/empty_with_groupby")
+        self.assert_order()
-
-