- make tuple a little more friendly

diff --git a/lib/sqlalchemy/log.py b/lib/sqlalchemy/log.py
index 0d28af5e63778eaa97ad3e588e755b9162a7ef26..62e0739f7c7b123cd319c2b2abe8e0a490d91721 100644 (file)
--- 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 0f55ac097d925aa6928a0d96b79f351f43ec1eb7..f3a1562c557cbb54aaa0e9287e5e1f53c877be6c 100644 (file)
--- 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)