turn commit_all into an iterative method

3 files changed, 29 insertions, 17 deletions

diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index 8fb13b3a0..b0d1718e0 100644
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -18,6 +18,7 @@ from . import attributes, exc as orm_exc
 from .interfaces import EXT_CONTINUE
 from ..sql import util as sql_util
 from .util import _none_set, state_str
+statelib = util.importlater("sqlalchemy.orm", "state")
 
 _new_runid = util.counter()
 
@@ -80,9 +81,10 @@ def instances(query, cursor, context):
                     context.refresh_state.dict, query._only_load_props)
             context.progress.pop(context.refresh_state)
 
-        for state, dict_ in context.progress.items():
-            state.commit_all(dict_, session.identity_map)
-
+        statelib.InstanceState.commit_all_states(
+            context.progress.items(),
+            session.identity_map
+        )
 
         for ii, (dict_, attrs) in context.partials.iteritems():
             ii.commit(dict_, attrs)
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 1f302923d..9ce3c8628 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -21,7 +21,7 @@ from .util import (
 from .unitofwork import UOWTransaction
 from .mapper import Mapper
 from .events import SessionEvents
-
+statelib = util.importlater("sqlalchemy.orm", "state")
 import sys
 
 __all__ = ['Session', 'SessionTransaction', 'SessionExtension']
@@ -1217,7 +1217,11 @@ class Session(object):
                     state.key = instance_key
 
                 self.identity_map.replace(state)
-                state.commit_all(state.dict, self.identity_map)
+
+        statelib.InstanceState.commit_all_states(
+            ((state, state.dict) for state in states),
+            self.identity_map
+        )
 
         self._register_altered(states)
         # remove from new last, might be the last strong ref
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index 52b29a99d..8333d6708 100644
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -435,24 +435,30 @@ class InstanceState(object):
          - the "modified" flag is set to False
          - any "expired" markers/callables for attributes loaded are removed.
 
-        Attributes marked as "expired" can potentially remain "expired" after this step
-        if a value was not populated in state.dict.
+        Attributes marked as "expired" can potentially remain 
+        "expired" after this step if a value was not populated in state.dict.
 
         """
+        self.commit_all_states([(self, dict_)], instance_dict)
 
-        self.committed_state.clear()
-        self.__dict__.pop('_pending_mutations', None)
+    @classmethod
+    def commit_all_states(self, iter, instance_dict=None):
+        """Mass version of commit_all()."""
+
+        for state, dict_ in iter:
+            state.committed_state.clear()
+            state.__dict__.pop('_pending_mutations', None)
 
-        callables = self.callables
-        for key in list(callables):
-            if key in dict_ and callables[key] is self:
-                del callables[key]
+            callables = state.callables
+            for key in list(callables):
+                if key in dict_ and callables[key] is state:
+                    del callables[key]
 
-        if instance_dict and self.modified:
-            instance_dict._modified.discard(self)
+            if instance_dict and state.modified:
+                instance_dict._modified.discard(state)
 
-        self.modified = self.expired = False
-        self._strong_obj = None
+            state.modified = state.expired = False
+            state._strong_obj = None
 
 class InspectAttr(object):
     """Provide inspection interface to an object's state."""