summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-01-28 20:30:42 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2010-01-28 20:30:42 +0000
commit0ca4107c3ed9caff2f6584e4b7215294a6409790 (patch)
tree7a6b74685fe73c60cdd195739fa2a60ff1c9e7b4 /lib/sqlalchemy/sql
parenta8220e2a8a6534cba9da9184103ed571497c3971 (diff)
downloadsqlalchemy-0ca4107c3ed9caff2f6584e4b7215294a6409790.tar.gz
add an informative error msg for non-collection passed to select()
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/expression.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 6d74fec16..bf3d16e69 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -3488,8 +3488,14 @@ class Select(_SelectBaseMixin, FromClause):
self._correlate = set()
self._froms = util.OrderedSet()
-
- if columns:
+
+ try:
+ cols_present = bool(columns)
+ except TypeError:
+ raise exc.ArgumentError("columns argument to select() must "
+ "be a Python list or other iterable")
+
+ if cols_present:
self._raw_columns = []
for c in columns:
c = _literal_as_column(c)