Changeset 528 for elixir/trunk

Timestamp:

09/02/10 10:10:22 (21 months ago)

Author:

ged

Message:

- Added more tests for relationships to forward-declared entities, including

a failing one (forward reference to a non-pk column).

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• tests/test_m2o.py (modified) (2 diffs)

elixir/trunk/CHANGES

@@ -4 +4 @@
 - Better support for Python 3.x by running 2to3 within setup (patch by
   "foogod", closes #110).
+- Added more tests for relationships to forward-declared entities.
 
 Changes:

elixir/trunk/tests/test_m2o.py

@@ -30 +30 @@
 
         assert b.a.name == 'a1'
+
+    def test_forward(self):
+        class A(Entity):
+            name = Field(String(60))
+
+        class B(Entity):
+            name = Field(String(60))
+            a = ManyToOne('A')
+            c = ManyToOne('C')
+
+        class C(Entity):
+            name = Field(String(60))
+
+        setup_all(True)
+
+        b1 = B(name='b1', a=A(name='a1'), c=C(name='c1'))
+
+        session.commit()
+        session.expunge_all()
+
+        b = B.query.one()
+
+        assert b.a.name == 'a1'
+        assert b.c.name == 'c1'
 
     # this test is in test_o2m.py
@@ -208 +232 @@
             name = Field(String(60))
             a = ManyToOne('A', target_column=['id', 'name'])
-# currently fails
-#            c = ManyToOne('C', target_column=['id', 'name'])
-
-#        class C(Entity):
+
+        setup_all(True)
+
+        b1 = B(name='b1', a=A(name='a1'))
+
+        session.commit()
+        session.expunge_all()
+
+        b = B.query.one()
+
+        assert b.a.name == 'a1'
+
+    # currently fails. See elixir/relationships.py:create_keys
+#    def test_non_pk_forward(self):
+#        class B(Entity):
+#            name = Field(String(60))
+#            a = ManyToOne('A', target_column=['id', 'name'])
+#
+#        class A(Entity):
 #            name = Field(String(60), unique=True)
-
-        setup_all(True)
-
-        b1 = B(name='b1', a=A(name='a1'))
-
-        session.commit()
-        session.expunge_all()
-
-        b = B.query.one()
-
-        assert b.a.name == 'a1'
+#
+#        setup_all(True)
+#
+#        b1 = B(name='b1', a=A(name='a1'))
+#
+#        session.commit()
+#        session.expunge_all()
+#
+#        b = B.query.one()
+#
+#        assert b.a.name == 'a1'
 
     def test_belongs_to_syntax(self):