Changeset 433 for elixir/trunk

Timestamp:

12/17/08 16:01:02 (3 years ago)

Author:

ged

Message:

revert part of previous commit... SA can't possibly compute itself the
inherit_condition when there are several FK from the child table to the parent
table

Location:

elixir/trunk

Files:

• elixir/entity.py (modified) (4 diffs)
• tests/test_inherit.py (modified) (2 diffs)

elixir/trunk/elixir/entity.py

@@ -44 +44 @@
         self.module = sys.modules.get(entity.__module__)
 
+        # used for multi-table inheritance
+        self.join_condition = None
         self.has_pk = False
         self._pk_col_done = False
@@ -175 +177 @@
                     parent_desc = self.parent._descriptor
                     tablename = parent_desc.table_fullname
+                    join_clauses = []
                     for pk_col in parent_desc.primary_keys:
                         colname = options.MULTIINHERITANCECOL_NAMEFORMAT % \
@@ -188 +191 @@
                                      primary_key=True)
                         self.add_column(col)
+                        join_clauses.append(col == pk_col)
+                    self.join_condition = and_(*join_clauses)
                 elif self.inheritance == 'concrete':
                     # Copy primary key columns from the parent.
@@ -379 +384 @@
                 # non-polymorphic concrete doesn't need this
                 kwargs['inherits'] = self.parent.mapper
+
+            if self.inheritance == 'multi' and self.parent:
+                kwargs['inherit_condition'] = self.join_condition
 
             if self.polymorphic:

elixir/trunk/tests/test_inherit.py

@@ -158 +158 @@
             data = Field(String(50))
             some_c = ManyToOne('C')
+            some_a = ManyToOne('A')
 
         class C(A):
@@ -174 +175 @@
         for a in A.query.all():
             if isinstance(a, (B, C)):
+                # On SA 0.4.x, this test works whether with_polymorphic is
+                # specified or not, because in 0.4.x, without with_polymorphic,
+                # it issues as many queries as necessary to load all data,
+                # while in 0.5, columns are "deferred".
                 assert 'data' in a.__dict__