Changeset 324 for elixir/trunk/elixir/entity.py

Timestamp:

04/29/08 17:42:06 (5 years ago)

Author:

ged

Message:

- use with_polymorphic mapper argument to implement polymorphic concrete

inheritance instead of the deprecated select_table. This bumps SA
requirement to 0.4.5 if you want to use concrete polymorphic inheritance.

- Also, issue a with_polymorphic argument for any Entity with children, which

allows loading polymorphically from the middle of a class chain (e.g,
loading all B and C in a A B C inheritance chain).

Files:

• elixir/trunk/elixir/entity.py (modified) (1 diff)

elixir/trunk/elixir/entity.py

@@ -415 +415 @@
 
             if self.polymorphic:
-                if self.children and not self.parent:
+                if self.children:
                     if self.inheritance == 'concrete':
                         keys = [(self.identity, self.entity.table)]
                         keys.extend([(child._descriptor.identity, child.table) 
                                      for child in self._get_children()])
+                        #XXX: we might need to change the alias name so that 
+                        # children (which are parent themselves) don't end up
+                        # with the same alias than their parent?
                         pjoin = polymorphic_union(
                                     dict(keys), self.polymorphic, 'pjoin')
-                        kwargs['select_table'] = pjoin
+
+                        kwargs['with_polymorphic'] = ('*', pjoin)
                         kwargs['polymorphic_on'] = \
                             getattr(pjoin.c, self.polymorphic)
-                    else:
+                    elif not self.parent:
                         kwargs['polymorphic_on'] = \
                             self.get_column(self.polymorphic)
+
                     #TODO: this is an optimization, and it breaks the multi
                     # table polymorphic inheritance test with a relation.