From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 4 Dec 2011 01:09:13 +0000 (-0500)
Subject: - [bug] Fixed the error formatting raised when
X-Git-Tag: rel_0_6_9~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a561ac656eea4ad2464ca8dfef5806191da3805;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- [bug] Fixed the error formatting raised when
a tuple is inadvertently passed to session.query()
[ticket:2297].
---

diff --git a/CHANGES b/CHANGES
index 5f4f9cf59e..94c56f5fea 100644
--- 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 6065c7a1cc..1f6d0df2bd 100644
--- 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 873cd42b42..c65bdebc1a 100644
--- 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."""