Fix ArgumentError access in Session._add_bind

Fixes: #3798
Change-Id: Ib4e6344b599e871f9d46d36a5aeb7ba3104dc99b
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/293
(cherry picked from commit 7ea54611516147a1af917691c60e1823b77c7ecf)

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 0e418423345e9283e8025d3871ab6f542131d280..5f9a35f688932dba157e50bdbef239afc81fe714 100644 (file)
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,6 +18,16 @@
 .. changelog::
     :version: 1.0.16
 
+    .. change::
+        :tags: bug, orm
+        :tickets: 3798
+        :versions: 1.1.0
+
+        Fixed bug where the ArgumentError raised for an invalid bind
+        sent to a Session via :meth:`.Session.bind_mapper`,
+        :meth:`.Session.bind_table`,
+        or the constructor would fail to be correctly raised.
+
     .. change::
         :tags: bug, mssql
         :tickes: 3791

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 000441fb95ef8530374420314e15ebabbcb934d2..9a3e1269bbdf8520eef4f0c5d67c3dfcaeb88ddb 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1113,9 +1113,8 @@ class Session(_SessionClassMethods):
             insp = inspect(key)
         except sa_exc.NoInspectionAvailable:
             if not isinstance(key, type):
-                raise exc.ArgumentError(
-                            "Not acceptable bind target: %s" %
-                            key)
+                raise sa_exc.ArgumentError(
+                    "Not an acceptable bind target: %s" % key)
             else:
                 self.__binds[key] = bind
         else:
@@ -1126,9 +1125,8 @@ class Session(_SessionClassMethods):
                 for selectable in insp._all_tables:
                     self.__binds[selectable] = bind
             else:
-                raise exc.ArgumentError(
-                            "Not acceptable bind target: %s" %
-                            key)
+                raise sa_exc.ArgumentError(
+                    "Not an acceptable bind target: %s" % key)
 
     def bind_mapper(self, mapper, bind):
         """Associate a :class:`.Mapper` with a "bind", e.g. a :class:`.Engine`

diff --git a/test/orm/test_bind.py b/test/orm/test_bind.py
index c5ddf151b55ea4dcaf8441e1d48877eaa67601f8..cbbf24ac3e38fa2b3aa5ae89ab3aa4d048b3fab6 100644 (file)
--- a/test/orm/test_bind.py
+++ b/test/orm/test_bind.py
@@ -138,6 +138,24 @@ class BindIntegrationTest(_fixtures.FixtureTest):
 
         sess.close()
 
+    def test_bind_arg(self):
+        sess = Session()
+
+        assert_raises_message(
+            sa.exc.ArgumentError,
+            "Not an acceptable bind target: foobar",
+            sess.bind_mapper, "foobar", testing.db
+        )
+
+        mapper(self.classes.User, self.tables.users)
+        u_object = self.classes.User()
+
+        assert_raises_message(
+            sa.exc.ArgumentError,
+            "Not an acceptable bind target: User()",
+            sess.bind_mapper, u_object, testing.db
+        )
+
     @engines.close_open_connections
     def test_bound_connection(self):
         users, User = self.tables.users, self.classes.User