- reverse the last commit temporarily as it breaks all the polymorphic cases

5 files changed, 28 insertions, 131 deletions

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 79e43e6a3..089c9fafb 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -23,23 +23,6 @@
     on compatibility concerns, see :doc:`/changelog/migration_10`.
 
     .. change::
-        :tags: bug, orm
-        :tickets: 3227, 3242, 1326
-
-        The primary :class:`.Mapper` of a :class:`.Query` is now passed to the
-        :meth:`.Session.get_bind` method when calling upon
-        :meth:`.Query.count`, :meth:`.Query.update`, :meth:`.Query.delete`,
-        as well as queries against mapped columns,
-        :obj:`.column_property` objects, and SQL functions and expressions
-        derived from mapped columns.   This allows sessions that rely upon
-        either customized :meth:`.Session.get_bind` schemes or "bound" metadata
-        to work in all relevant cases.
-
-        .. seealso::
-
-            :ref:`bug_3227`
-
-    .. change::
         :tags: enhancement, sql
         :tickets: 3074
 
diff --git a/doc/build/changelog/migration_10.rst b/doc/build/changelog/migration_10.rst
index c0369d8b8..bd878f4cb 100644
--- a/doc/build/changelog/migration_10.rst
+++ b/doc/build/changelog/migration_10.rst
@@ -381,59 +381,6 @@ of inheritance-oriented scenarios, including:
 
 :ticket:`3035`
 
-
-.. _bug_3227:
-
-Session.get_bind() will receive the Mapper in all relevant Query cases
------------------------------------------------------------------------
-
-A series of issues were repaired where the :meth:`.Session.get_bind`
-would not receive the primary :class:`.Mapper` of the :class:`.Query`,
-even though this mapper was readily available (the primary mapper is the
-single mapper, or alternatively the first mapper, that is associated with
-a :class:`.Query` object).
-
-The :class:`.Mapper` object, when passed to :meth:`.Session.get_bind`,
-is typically used by sessions that make use of the
-:paramref:`.Session.binds` parameter to associate mappers with a
-series of engines (although in this use case, things frequently
-"worked" in most cases anyway as the bind would be located via the
-mapped table object), or more specifically implement a user-defined
-:meth:`.Session.get_bind` method that provies some pattern of
-selecting engines based on mappers, such as horizontal sharding or a
-so-called "routing" session that routes queries to different backends.
-
-These scenarios include:
-
-* :meth:`.Query.count`::
-
-        session.query(User).count()
-
-* :meth:`.Query.update` and :meth:`.Query.delete`, both for the UPDATE/DELETE
-  statement as well as for the SELECT used by the "fetch" strategy::
-
-        session.query(User).filter(User.id == 15).update(
-                {"name": "foob"}, synchronize_session='fetch')
-
-        session.query(User).filter(User.id == 15).delete(
-                synchronize_session='fetch')
-
-* Queries against individual columns::
-
-        session.query(User.id, User.name).all()
-
-* SQL functions and other expressions against indirect mappings such as
-  :obj:`.column_property`::
-
-        class User(Base):
-            # ...
-
-            score = column_property(func.coalesce(self.tables.users.c.name, None)))
-
-        session.query(func.max(User.score)).scalar()
-
-:ticket:`3227` :ticket:`3242` :ticket:`1326`
-
 .. _feature_2963:
 
 .info dictionary improvements
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index c3b2d7bcb..e553f399d 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -1030,7 +1030,6 @@ class BulkUD(object):
 
     def __init__(self, query):
         self.query = query.enable_eagerloads(False)
-        self.mapper = self.query._bind_mapper()
 
     @property
     def session(self):
@@ -1125,7 +1124,6 @@ class BulkFetch(BulkUD):
             self.primary_table.primary_key)
         self.matched_rows = session.execute(
             select_stmt,
-            mapper=self.mapper,
             params=query._params).fetchall()
 
 
@@ -1136,6 +1134,7 @@ class BulkUpdate(BulkUD):
         super(BulkUpdate, self).__init__(query)
         self.query._no_select_modifiers("update")
         self.values = values
+        self.mapper = self.query._mapper_zero_or_none()
 
     @classmethod
     def factory(cls, query, synchronize_session, values):
@@ -1181,8 +1180,7 @@ class BulkUpdate(BulkUD):
                                  self.context.whereclause, values)
 
         self.result = self.query.session.execute(
-            update_stmt, params=self.query._params,
-            mapper=self.mapper)
+            update_stmt, params=self.query._params)
         self.rowcount = self.result.rowcount
 
     def _do_post(self):
@@ -1209,10 +1207,8 @@ class BulkDelete(BulkUD):
         delete_stmt = sql.delete(self.primary_table,
                                  self.context.whereclause)
 
-        self.result = self.query.session.execute(
-            delete_stmt,
-            params=self.query._params,
-            mapper=self.mapper)
+        self.result = self.query.session.execute(delete_stmt,
+                                                 params=self.query._params)
         self.rowcount = self.result.rowcount
 
     def _do_post(self):
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index cd8b0efbe..7302574e6 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -146,7 +146,7 @@ class Query(object):
                         ext_info,
                         aliased_adapter
                     )
-                ent.setup_entity(ent, *d[entity])
+                ent.setup_entity(*d[entity])
 
     def _mapper_loads_polymorphically_with(self, mapper, adapter):
         for m2 in mapper._with_polymorphic_mappers or [mapper]:
@@ -160,6 +160,7 @@ class Query(object):
 
         for from_obj in obj:
             info = inspect(from_obj)
+
             if hasattr(info, 'mapper') and \
                     (info.is_mapper or info.is_aliased_class):
                 self._select_from_entity = from_obj
@@ -285,9 +286,8 @@ class Query(object):
         return self._entities[0]
 
     def _mapper_zero(self):
-        return self._select_from_entity \
-            if self._select_from_entity is not None \
-            else self._entity_zero().entity_zero
+        return self._select_from_entity or \
+            self._entity_zero().entity_zero
 
     @property
     def _mapper_entities(self):
@@ -301,14 +301,11 @@ class Query(object):
             self._mapper_zero()
         )
 
-    def _bind_mapper(self):
-        ezero = self._mapper_zero()
-        if ezero is not None:
-            insp = inspect(ezero)
-            if hasattr(insp, 'mapper'):
-                return insp.mapper
-
-        return None
+    def _mapper_zero_or_none(self):
+        if self._primary_entity:
+            return self._primary_entity.mapper
+        else:
+            return None
 
     def _only_mapper_zero(self, rationale=None):
         if len(self._entities) > 1:
@@ -991,7 +988,6 @@ class Query(object):
             statement.correlate(None)
         q = self._from_selectable(fromclause)
         q._enable_single_crit = False
-        q._select_from_entity = self._mapper_zero()
         if entities:
             q._set_entities(entities)
         return q
@@ -2530,7 +2526,7 @@ class Query(object):
 
     def _execute_and_instances(self, querycontext):
         conn = self._connection_from_session(
-            mapper=self._bind_mapper(),
+            mapper=self._mapper_zero_or_none(),
             clause=querycontext.statement,
             close_with_result=True)
 
@@ -3164,7 +3160,7 @@ class _MapperEntity(_QueryEntity):
 
     supports_single_entity = True
 
-    def setup_entity(self, original_entity, ext_info, aliased_adapter):
+    def setup_entity(self, ext_info, aliased_adapter):
         self.mapper = ext_info.mapper
         self.aliased_adapter = aliased_adapter
         self.selectable = ext_info.selectable
@@ -3511,9 +3507,9 @@ class _BundleEntity(_QueryEntity):
         for ent in self._entities:
             ent.adapt_to_selectable(c, sel)
 
-    def setup_entity(self, original_entity, ext_info, aliased_adapter):
+    def setup_entity(self, ext_info, aliased_adapter):
         for ent in self._entities:
-            ent.setup_entity(original_entity, ext_info, aliased_adapter)
+            ent.setup_entity(ext_info, aliased_adapter)
 
     def setup_context(self, query, context):
         for ent in self._entities:
@@ -3596,23 +3592,15 @@ class _ColumnEntity(_QueryEntity):
         # leaking out their entities into the main select construct
         self.actual_froms = actual_froms = set(column._from_objects)
 
-        all_elements = [
-            elem for elem in visitors.iterate(column, {})
-            if 'parententity' in elem._annotations
-        ]
-
-        self.entities = util.unique_list([
-            elem._annotations['parententity']
-            for elem in all_elements
-        ])
-        self._from_entities = set(
+        self.entities = util.OrderedSet(
             elem._annotations['parententity']
-            for elem in all_elements
-            if actual_froms.intersection(elem._from_objects)
+            for elem in visitors.iterate(column, {})
+            if 'parententity' in elem._annotations
+            and actual_froms.intersection(elem._from_objects)
         )
 
         if self.entities:
-            self.entity_zero = self.entities[0]
+            self.entity_zero = list(self.entities)[0]
         elif self.namespace is not None:
             self.entity_zero = self.namespace
         else:
@@ -3635,12 +3623,10 @@ class _ColumnEntity(_QueryEntity):
         c.entity_zero = self.entity_zero
         c.entities = self.entities
 
-    def setup_entity(self, original_entity, ext_info, aliased_adapter):
+    def setup_entity(self, ext_info, aliased_adapter):
         if 'selectable' not in self.__dict__:
             self.selectable = ext_info.selectable
-
-        if original_entity in self._from_entities:
-            self.froms.add(ext_info.selectable)
+        self.froms.add(ext_info.selectable)
 
     def corresponds_to(self, entity):
         # TODO: just returning False here,
diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index 8639dde74..af6d960f5 100644
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -3224,9 +3224,8 @@ class SessionBindTest(QueryTest):
         get_bind = mock.Mock(side_effect=session.get_bind)
         with mock.patch.object(session, "get_bind", get_bind):
             yield
-        for call_ in get_bind.mock_calls:
-            is_(call_[1][0], inspect(self.classes.User))
-            is_not_(call_[2]['clause'], None)
+        is_(get_bind.mock_calls[0][1][0], inspect(self.classes.User))
+        is_not_(get_bind.mock_calls[0][2]['clause'], None)
 
     def test_single_entity_q(self):
         User = self.classes.User
@@ -3252,34 +3251,20 @@ class SessionBindTest(QueryTest):
         with self._assert_bind_args(session):
             session.query(func.max(User.name)).all()
 
-    def test_bulk_update_no_sync(self):
+    def test_bulk_update(self):
         User = self.classes.User
         session = Session()
         with self._assert_bind_args(session):
             session.query(User).filter(User.id == 15).update(
                 {"name": "foob"}, synchronize_session=False)
 
-    def test_bulk_delete_no_sync(self):
+    def test_bulk_delete(self):
         User = self.classes.User
         session = Session()
         with self._assert_bind_args(session):
             session.query(User).filter(User.id == 15).delete(
                 synchronize_session=False)
 
-    def test_bulk_update_fetch_sync(self):
-        User = self.classes.User
-        session = Session()
-        with self._assert_bind_args(session):
-            session.query(User).filter(User.id == 15).update(
-                {"name": "foob"}, synchronize_session='fetch')
-
-    def test_bulk_delete_fetch_sync(self):
-        User = self.classes.User
-        session = Session()
-        with self._assert_bind_args(session):
-            session.query(User).filter(User.id == 15).delete(
-                synchronize_session='fetch')
-
     def test_column_property(self):
         User = self.classes.User