removed ridiculous LOrderedProp object

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index b4d62928ebd7bc74b1ecc7cebfeea9026d683d62..83795da8d3ad7b6d2d982d99576080bbf6067dfc 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -107,9 +107,6 @@ class Mapper(object):
         self.delete_orphans = []
         self.batch = batch
         self.column_prefix = column_prefix
-        # a Column which is used during a select operation to retrieve the
-        # "polymorphic identity" of the row, which indicates which Mapper should be used
-        # to construct a new object instance from that row.
         self.polymorphic_on = polymorphic_on
         self._eager_loaders = util.Set()
 
@@ -131,16 +128,7 @@ class Mapper(object):
         else:
             self.polymorphic_map = _polymorphic_map
 
-        class LOrderedProp(util.OrderedProperties):
-            """this extends OrderedProperties to trigger a compile() before the
-            members of the object are accessed."""
-            def _get_data(s):
-                self.compile()
-                return s.__dict__['_data']
-            _data = property(_get_data)
-
-        self.columns = LOrderedProp()
-        self.c = self.columns
+        self.columns = self.c = util.OrderedProperties()
 
         self.include_properties = include_properties
         self.exclude_properties = exclude_properties
@@ -164,11 +152,6 @@ class Mapper(object):
         self.__should_log_debug = logging.is_debug_enabled(self.logger)
         self.__log("constructed")
 
-        # uncomment to compile at construction time (the old way)
-        # this will break mapper setups that arent declared in the order
-        # of dependency
-        #self.compile()
-
     def __log(self, msg):
         self.logger.info("(" + self.class_.__name__ + "|" + (self.entity_name is not None and "/%s" % self.entity_name or "") + (self.local_table and self.local_table.name or str(self.local_table)) + (not self._is_primary_mapper() and "|non-primary" or "") + ") " + msg)
 

diff --git a/test/orm/unitofwork.py b/test/orm/unitofwork.py
index 90928dfd8e9c47d9a6a1a39283ebbef6d103b461..40780c263a83a863687104541eb7d7b8e77278d5 100644 (file)
--- a/test/orm/unitofwork.py
+++ b/test/orm/unitofwork.py
@@ -858,11 +858,11 @@ class OneToManyTest(ORMTest):
         m2 = mapper(Address, addresses)
         m = mapper(User, users, properties={
             'boston_addresses' : relation(m2, primaryjoin=
-                        and_(users.c.user_id==Address.c.user_id, 
-                        Address.c.email_address.like('%boston%'))),
+                        and_(users.c.user_id==addresses.c.user_id, 
+                        addresses.c.email_address.like('%boston%'))),
             'newyork_addresses' : relation(m2, primaryjoin=
-                        and_(users.c.user_id==Address.c.user_id, 
-                        Address.c.email_address.like('%newyork%'))),
+                        and_(users.c.user_id==addresses.c.user_id, 
+                        addresses.c.email_address.like('%newyork%'))),
         })
         u = User()
         a = Address()