diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-02-08 19:58:34 -0500 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-02-08 19:58:34 -0500 |
commit | 7b9134be7129346e486a5caca7bdc87de7ccf015 (patch) | |
tree | f2c5c9338b73235767fca088cba8b9b74cf661b6 /lib/sqlalchemy/orm/query.py | |
parent | a7c8cf0f2f456485a358d6b9ffe69516b8164bcd (diff) | |
download | sqlalchemy-7b9134be7129346e486a5caca7bdc87de7ccf015.tar.gz |
- test + changelog
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r-- | lib/sqlalchemy/orm/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 3680f47eb..07f949d8e 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1775,7 +1775,7 @@ class Query(object): kwargs.pop('isouter', False) if kwargs: raise TypeError("unknown arguments: %s" % - ','.join(kwargs)) + ', '.join(sorted(kwargs))) isouter = isouter return self._join(props, outerjoin=isouter, create_aliases=aliased, @@ -1792,7 +1792,7 @@ class Query(object): kwargs.pop('from_joinpoint', False) if kwargs: raise TypeError("unknown arguments: %s" % - ','.join(kwargs)) + ', '.join(sorted(kwargs))) return self._join(props, outerjoin=True, create_aliases=aliased, from_joinpoint=from_joinpoint) |