Changeset 362 for elixir/trunk/elixir

Timestamp:

07/11/08 17:18:56 (4 years ago)

Author:

ged

Message:

• Added support for callables for some arguments on relationships:
  primaryjoin, secondaryjoin and remote_side. It means those can be evaluated
  at setup time (when tables and their columns already exist) instead of
  definition time (closes #50).
  
• Misc cleanup
  

Location:

elixir/trunk/elixir

Files:

• properties.py (modified) (2 diffs)
• relationships.py (modified) (3 diffs)

elixir/trunk/elixir/properties.py

@@ -58 +58 @@
 
     def create_tables(self):
-        pass
+        '''
+        Subclasses may override this method to create tables.
+        '''
 
     def after_table(self):
@@ -64 +66 @@
 
     def create_properties(self):
-        pass
+        '''
+        Subclasses may override this method to add properties to the involved 
+        entity.
+        '''
 
     def before_mapper(self):

elixir/trunk/elixir/relationships.py

@@ -380 +380 @@
         '''
 
-    def create_tables(self):
-        '''
-        Subclasses (ie. concrete relationships) may override this method to
-        create secondary tables.
-        '''
-
     def create_properties(self):
-        '''
-        Subclasses (ie. concrete relationships) may override this method to
-        add properties to the involved entities.
-        '''
         if self.property or self.backref:
             return
 
         kwargs = self.get_prop_kwargs()
+        if 'order_by' in kwargs:
+            kwargs['order_by'] = \
+                self.target._descriptor.translate_order_by(kwargs['order_by'])
+
+        # transform callable arguments
+        for arg in ('primaryjoin', 'secondaryjoin', 'remote_side'):
+            kwarg = kwargs.get(arg, None)
+            if callable(kwarg):
+                kwargs[arg] = kwarg()
 
         # viewonly relationships need to create "standalone" relations (ie
@@ -664 +663 @@
     uselist = True
 
-    def get_prop_kwargs(self):
-        kwargs = super(OneToMany, self).get_prop_kwargs()
-
-        if 'order_by' in kwargs:
-            kwargs['order_by'] = \
-                self.target._descriptor.translate_order_by(
-                    kwargs['order_by'])
-
-        return kwargs
-
 
 class ManyToMany(Relationship):
@@ -857 +846 @@
 
         kwargs.update(self.kwargs)
-
-        if 'order_by' in kwargs:
-            kwargs['order_by'] = \
-                self.target._descriptor.translate_order_by(kwargs['order_by'])
 
         return kwargs