Changeset 302

Timestamp:

02/07/08 14:30:31 (5 years ago)

Author:

ged

Message:

• Fixed the inverse relationship matching when the inverse relationship is
  defined in a parent Entity (thanks to Alexandre da Silva).
  

Location:

elixir/trunk

Files:

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

elixir/trunk/CHANGES

@@ -22 +22 @@
   options) if it doesn't use any statement itself.
 - Made inheritance work for custom base classes (closes #25).
+- Fixed the inverse relationship matching when the inverse relationship is 
+  defined in a parent Entity (thanks to Alexandre da Silva).
 - Fixed bug in setup_entities (it always used the global entity list and not
   the list given as argument).

elixir/trunk/elixir/entity.py

@@ -530 +530 @@
                 return rel
         if self.parent:
-            return self.parent.find_relationship(name)
+            return self.parent._descriptor.find_relationship(name)
         else:
             return None

elixir/trunk/tests/test_inherit.py

@@ -65 +65 @@
         cleanup_all(True)
 
-    def test_singletable_inheritance(self):
-        do_tst('single', False, True, {
-            'A': ('A', 'A', 'A', 'A', 'A'),
-            'B': ('B', 'B', 'B', 'B', 'B'),
-            'C': ('C', 'C', 'C', 'C', 'C'),
-            'D': ('D', 'D', 'D', 'D', 'D'),
-            'E': ('E', 'E', 'E', 'E', 'E')
-        })
-
     # this is related to SA ticket 866 
     # http://www.sqlalchemy.org/trac/ticket/866
@@ -113 +104 @@
 #        assert not B.table.select().execute().fetchall()
 
+    def test_inverse_matching_on_parent(self):
+        options_defaults['inheritance'] = 'multi'
+
+        class Person(Entity):
+            using_options(inheritance='multi')
+
+            name = Field(UnicodeText)
+
+        class Parent(Person):
+            using_options(inheritance='multi')
+            childs = ManyToMany('Child', tablename='child_parent',
+                                inverse='parents')
+
+        class Child(Person):
+            using_options(inheritance='multi')
+
+            parents = ManyToMany('Parent', tablename='child_parent',
+                                 inverse='childs')
+
+        setup_all()
+
+    def test_singletable_inheritance(self):
+        do_tst('single', False, True, {
+            'A': ('A', 'A', 'A', 'A', 'A'),
+            'B': ('B', 'B', 'B', 'B', 'B'),
+            'C': ('C', 'C', 'C', 'C', 'C'),
+            'D': ('D', 'D', 'D', 'D', 'D'),
+            'E': ('E', 'E', 'E', 'E', 'E')
+        })
+
     def test_polymorphic_singletable_inheritance(self):
         do_tst('single', True, True, {