From 3e486caaabdaa47692d24fb4f0a8ee05f07d5692 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 14 Nov 2008 18:57:24 +0000 Subject: - 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. --- lib/sqlalchemy/orm/strategies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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) -- cgit v1.2.1