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

Timestamp:

01/29/11 20:53:10 (16 months ago)

Author:

ged

Message:

- Fixed bad foreign key constraint generated for classes inheriting from a

class with multiple primary keys when using the "multi" inheritance.
Patch from & closes #114.

Files:

• elixir/trunk/elixir/entity.py (modified) (2 diffs)

elixir/trunk/elixir/entity.py

@@ -199 +199 @@
                     tablename = parent_desc.table_fullname
                     join_clauses = []
+                    fk_columns = []
                     for pk_col in parent_desc.primary_keys:
                         colname = options.MULTIINHERITANCECOL_NAMEFORMAT % \
@@ -208 +209 @@
                         # attached to a table
                         pk_col_name = "%s.%s" % (tablename, pk_col.key)
-                        fk = ForeignKey(pk_col_name, ondelete='cascade')
-                        col = Column(colname, pk_col.type, fk,
-                                     primary_key=True)
+                        col = Column(colname, pk_col.type, primary_key=True)
+                        fk_columns.append(col)
                         self.add_column(col)
                         join_clauses.append(col == pk_col)
                     self.join_condition = and_(*join_clauses)
+                    self.add_constraint(
+                        ForeignKeyConstraint(fk_columns,
+                            parent_desc.primary_keys, ondelete='CASCADE'))
                 elif self.inheritance == 'concrete':
                     # Copy primary key columns from the parent.