Merge branch 'master' into ticket_2501ticket_2501

Conflicts:
	lib/sqlalchemy/orm/mapper.py

1 files changed, 16 insertions, 12 deletions

diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index 1641f509e..af77fe3e0 100644
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -1,5 +1,5 @@
 # orm/loading.py
-# Copyright (C) 2005-2013 the SQLAlchemy authors and contributors <see AUTHORS file>
+# Copyright (C) 2005-2014 the SQLAlchemy authors and contributors <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -19,7 +19,6 @@ from .interfaces import EXT_CONTINUE
 from ..sql import util as sql_util
 from .util import _none_set, state_str
 from .. import exc as sa_exc
-sessionlib = util.importlater("sqlalchemy.orm", "session")
 
 _new_runid = util.counter()
 
@@ -34,7 +33,8 @@ def instances(query, cursor, context):
                 for ent in query._entities]
     filtered = id in filter_fns
 
-    single_entity = filtered and len(query._entities) == 1
+    single_entity = len(query._entities) == 1 and \
+                        query._entities[0].supports_single_entity
 
     if filtered:
         if single_entity:
@@ -44,7 +44,7 @@ def instances(query, cursor, context):
                 return tuple(fn(x) for x, fn in zip(row, filter_fns))
 
     custom_rows = single_entity and \
-                    query._entities[0].mapper.dispatch.append_result
+                    query._entities[0].custom_rows
 
     (process, labels) = \
                 list(zip(*[
@@ -98,11 +98,10 @@ def instances(query, cursor, context):
             break
 
 
-def merge_result(query, iterator, load=True):
+@util.dependencies("sqlalchemy.orm.query")
+def merge_result(querylib, query, iterator, load=True):
     """Merge a result into this :class:`.Query` object's Session."""
 
-    from . import query as querylib
-
     session = query.session
     if load:
         # flush current contents if we expect to load data
@@ -175,8 +174,6 @@ def load_on_ident(query, key,
                         only_load_props=None):
     """Load the given identity key from the database."""
 
-    lockmode = lockmode or query._lockmode
-
     if key is not None:
         ident = key[1]
     else:
@@ -214,10 +211,17 @@ def load_on_ident(query, key,
         q._params = params
 
     if lockmode is not None:
-        q._lockmode = lockmode
+        version_check = True
+        q = q.with_lockmode(lockmode)
+    elif query._for_update_arg is not None:
+        version_check = True
+        q._for_update_arg = query._for_update_arg
+    else:
+        version_check = False
+
     q._get_options(
         populate_existing=bool(refresh_state),
-        version_check=(lockmode is not None),
+        version_check=version_check,
         only_load_props=only_load_props,
         refresh_state=refresh_state)
     q._order_by = None
@@ -547,7 +551,7 @@ def load_scalar_attributes(mapper, state, attribute_names):
     """initiate a column-based attribute refresh operation."""
 
     #assert mapper is _state_mapper(state)
-    session = sessionlib._state_session(state)
+    session = state.session
     if not session:
         raise orm_exc.DetachedInstanceError(
                     "Instance %s is not bound to a Session; "