Changeset 274

Timestamp:

12/04/07 10:36:20 (6 years ago)

Author:

ged

Message:

Fixed associable to work with SQLAlchemy trunk (future 0.4.2).

Files:

• elixir/trunk/elixir/ext/associable.py (modified) (3 diffs)

elixir/trunk/elixir/ext/associable.py

@@ -188 +188 @@
         
             entity = self.entity
+            print "adding property", attr_name
             entity.mapper.add_property(
                 attr_name, 
@@ -194 +195 @@
             )
 
-            # this is strange! self.name is both set via mapper synonym and 
-            # the python property
-            entity.mapper.add_property(self.name, sa.orm.synonym(attr_name))
-
             if self.uselist:
                 def get(self):
+                    print "prop_get"
                     if getattr(self, attr_name) is None:
                         setattr(self, attr_name, 
@@ -220 +218 @@
                 setattr(entity, self.name, property(get, set))
 
+            # self.name is both set via mapper synonym and the python 
+            # property, but that's how synonym properties work.
+            # adding synonym property after "real" property otherwise it 
+            # breaks when using SQLAlchemy > 0.4.1
+            entity.mapper.add_property(self.name, sa.orm.synonym(attr_name))
+
             # add helper methods
             def select_by(cls, **kwargs):