Changeset 534 for elixir/trunk

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.

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/entity.py (modified) (2 diffs)
• tests/test_inherit.py (modified) (2 diffs)

elixir/trunk/CHANGES

@@ -12 +12 @@
 Bug fixes:
 - Fixed a few tests to work on SA 0.6.x
+- 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.
 
 0.7.1 - 2009-11-16

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.

elixir/trunk/tests/test_inherit.py

@@ -8 +8 @@
 def setup():
     metadata.bind = 'sqlite://'
-#    metadata.bind = 'postgres://@/test'
+#    metadata.bind = 'postgresql://@/test'
 #    metadata.bind.echo = True
     elixir.options_defaults['shortnames'] = True
@@ -144 +144 @@
         setup_all()
 
+    def test_multi_pk(self):
+        class A(Entity):
+            using_options(inheritance='multi')
+            firstname = Field(String(50), primary_key=True)
+            lastname = Field(String(50), primary_key=True)
+
+        class B(A):
+            using_options(inheritance='multi')
+
+        setup_all(True)
+
+        b1 = B(firstname='1', lastname='b')
+        b2 = B(firstname='2', lastname='b')
+
+        session.commit()
+
+        b1.delete()
+
+        session.commit()
+
+        assert len(B.query.all()) == 1
+
     def test_multitable_polymorphic_load(self):
         class A(Entity):