diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/log.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/log.py b/lib/sqlalchemy/log.py index 0d28af5e6..62e0739f7 100644 --- a/lib/sqlalchemy/log.py +++ b/lib/sqlalchemy/log.py @@ -112,7 +112,8 @@ class echo_property(object): if instance is None: return self else: - return instance._should_log_debug and 'debug' or (instance._should_log_info and True or False) + return instance._should_log_debug and 'debug' or \ + (instance._should_log_info and True or False) def __set__(self, instance, value): instance_logger(instance, echoflag=value) diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 0f55ac097..f3a1562c5 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2424,6 +2424,7 @@ class BooleanClauseList(ClauseList, ColumnElement): class _Tuple(ClauseList, ColumnElement): def __init__(self, *clauses, **kw): + clauses = [_literal_as_binds(c) for c in clauses] super(_Tuple, self).__init__(*clauses, **kw) self.type = _type_from_args(clauses) |