diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-11-14 18:57:24 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-11-14 18:57:24 +0000 |
| commit | 3e486caaabdaa47692d24fb4f0a8ee05f07d5692 (patch) | |
| tree | 49f89abfc85040dfcce750b4bad893b99c12f3f9 /lib/sqlalchemy | |
| parent | b2a7892b1091cadf0dddedb72adb98067f76f336 (diff) | |
| download | sqlalchemy-3e486caaabdaa47692d24fb4f0a8ee05f07d5692.tar.gz | |
- switched session.save() to session.add() throughout declarative test
- Fixed PendingDeprecationWarning involving order_by
parameter on relation(). [ticket:1226]
- Unit tests still filter pending deprecation warnings but have a commented-out
line to temporarily disable this behavior. Tests need to be fully converted
before we can turn this on.
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index ba5541944..156712bc7 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -546,7 +546,7 @@ class LoadLazyAttribute(object): return q.get(ident) if prop.order_by: - q = q.order_by(prop.order_by) + q = q.order_by(*util.to_list(prop.order_by)) if self.options: q = q._conditional_options(*self.options) |
