From: Gaëtan de Menten <gdementen@gmail.com>
Date: Sun, 11 Apr 2010 18:58:37 +0000 (+0200)
Subject: merge branch
X-Git-Tag: rel_0_6_0~23^2~15^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3bc6c08d4484538171456cd4253bb3d47fa99e0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge branch
---

d3bc6c08d4484538171456cd4253bb3d47fa99e0
diff --cc CHANGES
index 99b8ffa815,6fe3cbdc58..5e44313e94
--- a/CHANGES
+++ b/CHANGES
@@@ -34,11 -34,32 +34,36 @@@ CHANGE
    - id(obj) is no longer used internally within topological.py,
      as the sorting functions now require hashable objects
      only.  [ticket:1756]
+ 
+   - The ORM will set the docstring of all generated descriptors
+     to None by default.  This can be overridden using 'doc'
+     (or if using Sphinx, attribute docstrings work too).
+     
+   - Added kw argument 'doc' to all mapper property callables 
+     as well as Column().  Will assemble the string 'doc' as 
+     the '__doc__' attribute on the descriptor.  
+ 
+   - Usage of version_id_col on a backend that supports 
+     cursor.rowcount for execute() but not executemany() now works
+     when a delete is issued (already worked for saves, since those
+     don't use executemany()). For a backend that doesn't support 
+     cursor.rowcount at all, a warning is emitted the same
+     as with saves.  [ticket:1761]
+ 
+   - The ORM now short-term caches the "compiled" form of
+     insert() and update() constructs when flushing lists of 
+     objects of all the same class, thereby avoiding redundant
+     compilation per individual INSERT/UPDATE within an 
+     individual flush() call.
+     
+   - internal getattr(), setattr(), getcommitted() methods
+     on ColumnProperty, CompositeProperty, RelationshipProperty
+     have been underscored, signature has changed.
      
 +- engines
 +  - The C extension now also works with DBAPIs which use custom
 +    sequences as row (and not only tuples). [ticket:1757]
 +
  - sql
    - Restored some bind-labeling logic from 0.5 which ensures
      that tables with column names that overlap another column