summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/elements.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-01-05 14:11:12 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-01-05 14:11:12 -0500
commit196f7ee6cc132aa0f31741af80fa5c0ba77efcf2 (patch)
treeef4b141ad83f1698b89f0e247f99475a0621a951 /lib/sqlalchemy/sql/elements.py
parent7658a4c73c1e60cc4549389a72a2af26acfa51fc (diff)
downloadsqlalchemy-196f7ee6cc132aa0f31741af80fa5c0ba77efcf2.tar.gz
- conjunctions like and_() and or_() can now accept generators as arguments.
Diffstat (limited to 'lib/sqlalchemy/sql/elements.py')
-rw-r--r--lib/sqlalchemy/sql/elements.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index 56fca5dd8..c230802cc 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -1492,6 +1492,7 @@ class BooleanClauseList(ClauseList, ColumnElement):
def _construct(cls, operator, continue_on, skip_on, *clauses, **kw):
convert_clauses = []
+ clauses = util.coerce_generator_arg(clauses)
for clause in clauses:
clause = _literal_as_text(clause)