synchronize inherited does not need to be called for the full mapper hierarchy

diff --git a/examples/association/proxied_association.py b/examples/association/proxied_association.py
index ccd092f9576a581788bd5691aef65795dc59a976..ed3afd597c750ebbd65048faf1ce6b74c3e246e8 100644 (file)
--- a/examples/association/proxied_association.py
+++ b/examples/association/proxied_association.py
@@ -29,21 +29,22 @@ orderitems = Table('orderitems', metadata,
 
 metadata.create_all()
 
+class OrderItem(object):
+    def __init__(self, item, price=None):
+        self.item = item
+        self.price = price is None and item.price or price
+
 class Order(object):
     def __init__(self, customer_name):
         self.customer_name = customer_name
     items = AssociationProxy('itemassociations', 'item',
-                             creator=lambda x: OrderItem(x))
+                             creator=OrderItem)
 
 class Item(object):
     def __init__(self, description, price):
         self.description = description
         self.price = price
 
-class OrderItem(object):
-    def __init__(self, item, price=None):
-        self.item = item
-        self.price = price is None and item.price or price
 
 mapper(Order, orders, properties={
     'itemassociations':relation(OrderItem, cascade="all, delete-orphan", lazy=False)

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index d6dbc26341e8ec7aff16f4cdabeff0188c7b9665..a13e9feb35cc981610d706ec6d8b7eb8cac86563 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1223,12 +1223,12 @@ class Mapper(object):
                     mapper.__postfetch(uowtransaction, connection, table, state, c, c.last_inserted_params(), value_params)
 
                     # synchronize newly inserted ids from one table to the next
-                    # TODO: this fires off more than needed, try to organize syncrules
-                    # per table
-                    for m in reversed(list(mapper.iterate_to_root())):
-                        if m.__inherits_equated_pairs:
-                            m.__synchronize_inherited(state)
-
+                    # TODO: this performs some unnecessary attribute transfers
+                    # from an attribute to itself, since the attribute is often mapped
+                    # to multiple, equivalent columns
+                    if mapper.__inherits_equated_pairs:
+                        sync.populate(state, mapper, state, mapper, mapper.__inherits_equated_pairs)
+                        
                     # testlib.pragma exempt:__hash__
                     inserted_objects.add((state, connection))
 
@@ -1259,9 +1259,6 @@ class Mapper(object):
                     if 'after_update' in mapper.extension.methods:
                         mapper.extension.after_update(mapper, connection, state.obj())
 
-    def __synchronize_inherited(self, state):
-        sync.populate(state, self, state, self, self.__inherits_equated_pairs)
-
     def __postfetch(self, uowtransaction, connection, table, state, resultproxy, params, value_params):
         """For a given Table that has just been inserted/updated,
         mark as 'expired' those attributes which correspond to columns

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index d02432c260b96bd63d26d180a4d4a17ce987c083..cb0935f429ab6852c02c4f3c494fb0dccd6dee5e 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -267,7 +267,9 @@ class Query(object):
         return equivs
 
     def __no_criterion_condition(self, meth):
-        if self._criterion or self._statement or self._from_obj or self._limit is not None or self._offset is not None or self._group_by or self._order_by:
+        if self._criterion or self._statement or self._from_obj or \
+                self._limit is not None or self._offset is not None or \
+                self._group_by or self._order_by:
             raise sa_exc.InvalidRequestError("Query.%s() being called on a Query with existing criterion. " % meth)
 
         self._statement = self._criterion = self._from_obj = None