raise objectdeleted on deferred if row isn't present, test coverage

diff -r eaa7aa4239af4f42cdb8b370120d1538c6704d6b lib/sqlalchemy/orm/exc.py
--- a/lib/sqlalchemy/orm/exc.py Sun Jun 12 20:35:37 2011 -0400
+++ b/lib/sqlalchemy/orm/exc.py Mon Jun 13 10:45:16 2011 -0400
@@ -7,7 +7,7 @@
 """SQLAlchemy ORM exceptions."""

 import sqlalchemy as sa
-
+orm_util = sa.util.importlater('sqlalchemy.orm', 'util')

 NO_STATE = (AttributeError, KeyError)
 """Exception types that may be raised by instrumentation implementations."""
@@ -78,7 +78,12 @@

 class ObjectDeletedError(sa.exc.InvalidRequestError):
     """An refresh() operation failed to re-retrieve an object's row."""
-
+    def __init__(self, state):
+        sa.exc.InvalidRequestError.__init__(
+            self,
+            "Instance '%s' has been deleted, or its "
+            "row is otherwise not present." % orm_util.state_str(state)
+        )

 class UnmappedColumnError(sa.exc.InvalidRequestError):
     """Mapping operation was requested on an unknown column."""
diff -r eaa7aa4239af4f42cdb8b370120d1538c6704d6b lib/sqlalchemy/orm/mapper.py
--- a/lib/sqlalchemy/orm/mapper.py  Sun Jun 12 20:35:37 2011 -0400
+++ b/lib/sqlalchemy/orm/mapper.py  Mon Jun 13 10:45:16 2011 -0400
@@ -1575,9 +1575,7 @@
         # if instance is pending, a refresh operation 
         # may not complete (even if PK attributes are assigned)
         if has_key and result is None:
-            raise orm_exc.ObjectDeletedError(
-                                "Instance '%s' has been deleted." % 
-                                state_str(state))
+            raise orm_exc.ObjectDeletedError(state)

     def _optimized_get_statement(self, state, attribute_names):
         """assemble a WHERE clause which retrieves a given state by primary
diff -r eaa7aa4239af4f42cdb8b370120d1538c6704d6b lib/sqlalchemy/orm/strategies.py
--- a/lib/sqlalchemy/orm/strategies.py  Sun Jun 12 20:35:37 2011 -0400
+++ b/lib/sqlalchemy/orm/strategies.py  Mon Jun 13 10:45:16 2011 -0400
@@ -242,8 +242,10 @@
                 )

         query = session.query(localparent)
-        query._load_on_ident(state.key, 
-                    only_load_props=group, refresh_state=state)
+        if query._load_on_ident(state.key, 
+                    only_load_props=group, refresh_state=state) is None:
+            raise orm_exc.ObjectDeletedError(state)
+
         return attributes.ATTR_WAS_SET

 log.class_logger(DeferredColumnLoader)
consider adding individual objectdeletederror tests to test_session, breaking up test_get_refreshes in test_expire.
Comments (3)
