Changeset 3525

Timestamp:

10/19/07 15:14:07 (1 year ago)

Author:

roger

Message:

Fixed pagination of Query objects (sqlalchemy), thanks to Jonathan Hitchcock and Remi Jolin (#1434).

Paginate can now order a SA Query object by attributes from related objects (#1582).
Notice that it only works with SQLAlchemy 0.3.x at the moment... (see: #1591).

Files:

• branches/1.0/CHANGELOG.txt (modified) (21 diffs)
• branches/1.0/turbogears/paginate.py (modified) (4 diffs)

branches/1.0/CHANGELOG.txt

@@ -8 +8 @@
-*Features*
-    * "tg-admin sql" is now more powerful for SQLAlchemy. Ticket #1418
+    * Paginate allows ordering by attributes from related objects (SQLAlchemy
+      Query objects only). Ticket #1582.
-
-*Fixes*
-    * Ticket #1185: rollback SA transaction if a controller method fails, and it
-      has an exception_handler.
- 
+
-      cases.
- 
+
-      error when paginating Query objects (sqlalchemy) and ordering by 4 or more
-      columns.
+    * Ticket #1434: Fixed pagination of Query objects (SQLAlchemy). The first
+      patch assumed that Query objects have a _query attribute which holds the
+      query object, which is only true for SelectResults objects.
-
-*Contributors*
-
-
+emi Jolin, Jonathan Hitchcock, R
-
-
@@ -74 +79 @@
-        * ticket #1434. Now handles SA Query in addition of SelectResults
-      which will be deprecated in the near future.
-
+
-        * ticket #1325  Fix visit entries created more than once in the
-          database.
@@ -123 +128 @@
-* make 'flash' block dynamic in quickstart
-* session setting is moved to config/app.cfg
- 
+
-* Enhancement SQLAlchemy default model, use 'assign' to avoid repeatedly writing, thanks cito
-* Able to specify a default doctype in genshi, thanks Alastair Houghton
@@ -140 +145 @@
-* Fixed bug in tg-admin that caused it not to operate properly on projects deployed as eggs. Patch
-  from #1361 by Christoph Zwerschke.
- 
+
-  #1267 by Paul Johnston.
- 
+
-* using base64.decodestring in visitor.py for 2.3 compatibility. #1279 by Paul Fisher.
-* Config file in quickstarted app now has config option to load identity classes. Thanks to Felix
-  Schwarz #1255.
-* Identity now supports encrypted passwords with unicode characters. Thanks to Felix Schwarz and
- 
+
-* minor changes to template so they work properly when server.webpath != / thanks to "nludban" #1213
-* fix quickstart project tests, thanks to Christoph Zwerschke #1289, Jeff Kowalczyk #1219
@@ -163 +168 @@
-* FormEncode version to i18n aware 0.7.1
-* RuleDispatch to 0.5a0.dev-r2303 for Python 2.5 support.
- 
+
-  deprecates functions used in decorator.py.
-
@@ -178 +183 @@
-* paginate decorator now supports SA, improves sorting and fixes problems
-  with CompoundWidget. Thanks to randall@tnr.cc and sbr77. #2404
- 
+
-  #2382
-* more docstring for widgets package #2355
@@ -187 +192 @@
-* Identity logout  now works properly when using ``set_identity_user`` #1245.
-  Thanks to Felix Schwarz
- 
+
-  XmlHttpRequest in IE. Thanks Simon King #2408
-* workaround for MySQLdb imcompatibilty with MySQL 4.1. Thanks to Felix Schwarz
@@ -196 +201 @@
-* fixes for FR locale in JavaScript for CalendarPicker. Thanks to Florent Aide
-  #2370
- 
+
-  #2366 #2374 #2376
- 
+
-  Christoph Zwerschke #2364
-* reverted #2256 which caused a RuntimeError #2340
@@ -217 +222 @@
-* now possible to pass any option (besides dburi and echo) to sqlalchemy
-  engine. Thanks to elftherios and Lee McFadden #2318 #2320
- 
+
-  Tim Freund #2263
-* support testing the code that uses identity. Thanks to Max Ischenko and
@@ -225 +230 @@
-*Features*
-
- 
+
-  turbogears.view.root_variable_providers. Thanks Arnar Birgisson #2261
-* turbogears.database.run_with_transaction is now a MultiorderGenericFunction to
@@ -236 +241 @@
-* Fix implicit transactions for SQLAlchemy. Thanks to Lee McFadden #2322
-* Various CSS fixes for DataGrid. Thanks Florent Aide #2316
- 
+
-  import in feed.py .Thanks Florent Aide #2310 #2312
-* Looser Enum implementation taht works better with ToscaWidgets #2303
@@ -244 +249 @@
-* throwing an identity.IdentityException inside a controller method is now
-  caught by identity.SecureResource #2250
- 
+
-  Jeff Kowalczyk #2247 #2266 #2268 #2314
-* 'logout' method in SQLObjectIdentity was setting read-only property. Does not
@@ -383 +388 @@
-* Former LocalizableJSLink is now CalendarLangFile. New LocalizableJSLink is
-  simpler but backwards-incompatible.
- 
+
-  To restrict access to it use Identity.SecureObject instead.
-
+
-*Deprecations*
-
-* Use of "entrys" is now deprecated in the FeedController. You should use
-  "entries" instead.
-
+
-*Features*
-
@@ -405 +410 @@
-* `tg-admin shell` now asks if it should commit changes to the database on exit.
-* Widgets can be listed at the `tg.include_widgets` config. list to send them to
- 
+
-* `DBTest` now drops tables after each test so they don't interfere with others.
-* Toolbox is now secured using Identity
@@ -420 +425 @@
-* `DateTimeConverter` now handles dates < 1900.
-* Catwalk now handles gracefully UnicodeCols.
- 
+
-  the system.
-* Kid's base templates are now (re)loaded properly.
@@ -442 +447 @@
-(My apologies if your name belongs here and is not!)
-
- 
- 
+
+
-Charles Duffy, Matt Good, Ksenia Marasanova.
-
@@ -459 +464 @@
-* In widgets, if you were using a dictionary as a params be aware that now
-  the dictionary is not updated at construction or display/render time but
- 
- 
+
+
-  look at how the TableForm does that.
-
@@ -470 +475 @@
-  precision.)
-* tg-admin info shows which eggs require TurboGears
- 
+
-  SingleSelectField and MultipleSelectField widgets take advantage of this
-  to provide an optgroup tag. The format of a grouped options list is like
-  the following:
-
+
-  options = [(None, [(1, "a"), (2, "b")]), ("Others", [(3, "c"), (4, "d")])]
-
@@ -491 +496 @@
-* Package name is used instead of `your_project` in the quickstart
-  logging config.
-
+
-*Fixes*
-
@@ -528 +533 @@
-Max Ischenko, Claudio Martinez, Matt Good, Rune Hansen, Michele Cella,
-Jorge Godoy, Alberto Valverde González, Simon Belak, Jeroen Dekkers,
- 
+
-Richard Standbrook, Roger Demetrescu, Patrick Lewis, Hal Wine,
-Jorge Vargas, Bob Kuehne.
@@ -575 +580 @@
-* For Python 2.3 users, there is a convenient new decorator syntax
-  that comes from Phillip Eby's PEAK.
-
+
-Here's is the equivalent of @expose():
-

branches/1.0/turbogears/paginate.py

@@ -342 +342 @@
-        col = getattr(var_data.sourceClass.q, colname, None)
-
- or isinstance(var_data, Query)
+
-        col = getattr(
-                var_data._query.mapper.c,
@@ -348 +348 @@
-                None)
-
+    elif isinstance(var_data, Query):
+        col = getattr(
+                var_data.mapper.c,
+                colname[len(var_data.mapper.column_prefix or ''):],
+                None)
+        #if no attribute is found, let's try searching for 'foreign' objects...
+        # eg.: address.user.occupation.name
+        if not col and colname.find('.'):
+            seq = colname.split('.')
+            mapper = var_data.mapper
+            for propname in seq[:-1]:
+                prop = mapper.properties.get(propname)
+                if not prop:
+                    break
+                mapper = prop.mapper
+            # last item from split should be a simple attribute
+            col = getattr(
+                    mapper.c,
+                    seq[-1][len(mapper.column_prefix or ''):],
+                    None)
-    else:
-        raise StandardError, 'expected SelectResults'
@@ -372 +392 @@
-
-# Ordering re:
-
+(\.\w+)*
-
-def convert_ordering(ordering):
@@ -392 +412 @@
-            for ordering_info in ordering_info_find:
-                ordering_key = str(ordering_info[0]).strip("'")
-1
-2
+2
+3
-                new_ordering[ordering_key] = [ordering_order,
-                                              ordering_reverse]