- [bug] Fixed the error formatting raised when

a tuple is inadvertently passed to session.query()
[ticket:2297].

diff --git a/CHANGES b/CHANGES
index 5f4f9cf59e777e81d960e50ddf5f940473a4a420..94c56f5feaf9d670ee8787c325dbce02a54de625 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -68,6 +68,10 @@ CHANGES
   - Cls.column.collate("some collation") now
     works.  [ticket:1776]
 
+   - [bug] Fixed the error formatting raised when 
+     a tuple is inadvertently passed to session.query()
+     [ticket:2297].
+
 - sql
   - Fixed two subtle bugs involving column 
     correspondence in a selectable,

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 6065c7a1cc2cdedbcc769b77fd7ae1e44d135d23..1f6d0df2bd71896814c0d5949b86e32ad3e8271b 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2786,7 +2786,7 @@ class _ColumnEntity(_QueryEntity):
         if not isinstance(column, sql.ColumnElement):
             raise sa_exc.InvalidRequestError(
                 "SQL expression, column, or mapped entity "
-                "expected - got '%r'" % column
+                "expected - got '%r'" % (column, )
             )
 
         # If the Column is unnamed, give it a

diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index 873cd42b42136d28cf1fe6278f616f0df93e3a32..c65bdebc1aa89448b4f7dac6f24201dec4c308d4 100644 (file)
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -365,6 +365,13 @@ class InvalidGenerationsTest(QueryTest, AssertsCompiledSQL):
         q = s.query(User)
         assert_raises(sa_exc.InvalidRequestError, q.add_column, object())
 
+    def test_invalid_column_tuple(self):
+        User = self.classes.User
+
+        s = create_session()
+        q = s.query(User)
+        assert_raises(sa_exc.InvalidRequestError, q.add_column, (1, 1))
+
     def test_distinct(self):
         """test that a distinct() call is not valid before 'clauseelement' conditions."""