Changeset 319

Timestamp:

04/03/08 10:12:30 (5 years ago)

Author:

ged

Message:

- Fixed ManyToOne relationships using 'key' kwarg in their column_kwargs

(patch by Jason R. Coombs)

- drop tables after test_through test

Location:

elixir/trunk

Files:

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

elixir/trunk/CHANGES

@@ -3 +3 @@
 Bug fixes:
 - Fixed multi-table inheritance when using a non default schema (closes #38)
+- Fixed ManyToOne relationships using 'key' kwarg in their column_kwargs
+  (patch by Jason R. Coombs) 
 
 0.5.2 - 2008-03-28

elixir/trunk/elixir/relationships.py

@@ -572 +572 @@
 
                 # store the names of those columns
-                fk_colnames.append(colname)
+                fk_colnames.append(col.key)
 
                 # build the list of column "paths" the foreign key will 

elixir/trunk/tests/test_m2o.py

@@ -51 +51 @@
 
         assert b.a.testx == 1
+
+    def test_wh_key_in_m2o_col_kwargs(self):
+        class A(Entity):
+            name = Field(String(128), default="foo")
+        
+        class B(Entity):
+            # specify a different key for the column so that
+            #  it doesn't override the property when the column
+            #  gets created.
+            a = ManyToOne('A', colname='a',
+                          column_kwargs=dict(key='a_id'))
+         
+        setup_all(True)
+
+        assert A.table.primary_key.columns.has_key('id')
+        assert B.table.columns.has_key('a_id')
+
+        a = A()
+        session.flush()
+        b = B(a=a)
+        session.flush()
+        session.clear()
+
+        assert B.query.first().a == A.query.first()
 
     def test_one_pk(self):

elixir/trunk/tests/test_through.py

@@ -1 +1 @@
 """
-    simple test case
+    test has_*(..., through=...) syntax
 """
 
@@ -12 +12 @@
 class TestThrough(object):
     def teardown(self):
-        cleanup_all()
+        cleanup_all(True)
     
     def test_rel_through(self):