From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 6 May 2008 19:06:43 +0000 (+0000)
Subject: Query.select() wont call filter() if arg is None
X-Git-Tag: rel_0_5beta1~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0be8f1264b596dc838693b2ee381ee98d1d5e4a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Query.select() wont call filter() if arg is None
---

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 982bb5d017..ae3ace7536 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()"""