use accepts scalar loader here so we deal with _ProxyImpl correctly

diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index 2c947a7acfe15387ea2e9678e621ef320f1ff4a1..8d73c9426c38ffab91b524e1c85c5d871a391706 100644 (file)
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -394,12 +394,10 @@ class InstanceState(interfaces._InspectionAttr):
 
     @property
     def _unloaded_non_object(self):
-        return self.unloaded.difference(self._uses_objects)
-
-    @property
-    def _uses_objects(self):
-        return (attr for attr in self.manager
-                    if self.manager[attr].impl.uses_objects)
+        return self.unloaded.intersection(
+                attr for attr in self.manager
+                    if self.manager[attr].impl.accepts_scalar_loader
+            )
 
     @property
     def expired_attributes(self):

diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
index a0f96838fdacde80c956dcf8522b3f426d15ef4f..67a11e3662ddeab04ae80b328facaecd4a5d16bf 100644 (file)
--- a/test/orm/test_unitofwork.py
+++ b/test/orm/test_unitofwork.py
@@ -857,9 +857,11 @@ class DefaultTest(fixtures.MappedTest):
         Secondary = self.classes.Secondary
 
         mapper(Hoho, default_t, eager_defaults=True, properties={
-                "sec": relationship(Secondary)
+                "sec": relationship(Secondary),
+                "syn": sa.orm.synonym(default_t.c.counter)
             })
 
+
         mapper(Secondary, self.tables.secondary_table)
         h1 = Hoho()