Session.bind gets used as a default even when table/mapper specific binds are defined.

diff --git a/CHANGES b/CHANGES
index 5f74037738c63266326c93bb18caba7f0196b71e..13ac302a15a48e882f6b6a5b6aa2982c135d0dea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,9 @@ CHANGES
       
     - Repaired `__str__()` method on Query. [ticket:1066]
 
+    - Session.bind gets used as a default even when table/mapper
+      specific binds are defined.
+
 - sqlite
     - Modified SQLite's representation of "microseconds" to 
       match the output of str(somedatetime), i.e. in that the

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 60b88cc0e07b7a275e13e59f8c911002afc7eb5f..2110f8826fbcc19bdb369048bb92008313990a8e 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -865,7 +865,8 @@ class Session(object):
                 for t in sql_util.find_tables(clause):
                     if t in self.__binds:
                         return self.__binds[t]
-        elif self.bind:
+
+        if self.bind:
             return self.bind
 
         if isinstance(clause, sql.expression.ClauseElement) and clause.bind: