summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-05-06 19:06:43 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-05-06 19:06:43 +0000
commitf0be8f1264b596dc838693b2ee381ee98d1d5e4a (patch)
tree89f31ce2629036c49c1fcd797d79663dd7313a6e /lib
parentb9e1a24898fa67ef9979f2f2ce50dfc2968cdc32 (diff)
downloadsqlalchemy-f0be8f1264b596dc838693b2ee381ee98d1d5e4a.tar.gz
Query.select() wont call filter() if arg is None
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/query.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 982bb5d01..ae3ace753 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1335,8 +1335,10 @@ class Query(object):
def _build_select(self, arg=None, params=None, **kwargs): #pragma: no cover
if isinstance(arg, sql.FromClause) and arg.supports_execution():
return self.from_statement(arg)
- else:
+ elif arg is not None:
return self.filter(arg)._legacy_select_kwargs(**kwargs)
+ else:
+ return self._legacy_select_kwargs(**kwargs)
def selectfirst(self, arg=None, **kwargs): #pragma: no cover
"""DEPRECATED. use query.filter(whereclause).first()"""