Changeset 297

Timestamp:

02/05/08 00:20:01 (5 years ago)

Author:

cleverdevil

Message:

Added a column_format keyword argument to ManyToMany which can be used to specify an alternate format string for column names in the mapping table. This is required to properly integrate with legacy TurboGears identity databases.

Location:

elixir/trunk

Files:

• elixir/relationships.py (modified) (3 diffs)
• tests/test_m2m.py (modified) (2 diffs)

elixir/trunk/elixir/relationships.py

@@ -225 +225 @@
 |                    | by a minus (for descending order).                     |
 +--------------------+--------------------------------------------------------+
+| ``column_format``  | Specify an alternate format string for naming the      |
+|                    | columns in the mapping table.  The default value is    |
+|                    | defined in ``elixir.options.M2MCOL_NAMEFORMAT``.  You  |
+|                    | will be passed ``tablename``, ``key``, and ``entity``  |
+|                    | as arguments to the format string.                     |
++--------------------+--------------------------------------------------------+
+
 
 ================
@@ -671 +678 @@
         self.ondelete = kwargs.pop('ondelete', None)
         self.onupdate = kwargs.pop('onupdate', None)
+        self.column_format = kwargs.pop('column_format', options.M2MCOL_NAMEFORMAT)
 
         self.secondary_table = None
@@ -749 +757 @@
             
                 for pk_col in desc.primary_keys:
-                    colname = options.M2MCOL_NAMEFORMAT % \
+                    colname = self.column_format % \
                               {'tablename': desc.tablename,
-                               'key': pk_col.key}
-
+                               'key': pk_col.key,
+                               'entity': desc.entity.__name__.lower()}
+                    
                     # In case we have a many-to-many self-reference, we 
                     # need to tweak the names of the columns so that we 

elixir/trunk/tests/test_m2m.py

@@ -13 +13 @@
     def teardown(self):
         cleanup_all(True)
-    
+        
     def test_simple(self):
         class A(Entity):
@@ -35 +35 @@
         assert a in b.as_
         assert b in a.bs_
+    
+    def test_column_format(self):
+        class A(Entity):
+            using_options(tablename='aye')
+            name = Field(String(60))
+            bs_ = ManyToMany('B', column_format='%(entity)s_%(key)s')
 
+        class B(Entity):
+            using_options(tablename='bee')
+            name = Field(String(60))
+            as_ = ManyToMany('A', column_format='%(entity)s_%(key)s')
+
+        setup_all(True)
+
+        b1 = B(name='b1', as_=[A(name='a1')])
+
+        session.flush()
+        session.clear()
+
+        a = A.query.one()
+        b = B.query.one()
+
+        assert a in b.as_
+        assert b in a.bs_
+        
+        found_a = False
+        found_b = False
+        for column in A.mapper.get_property('bs_').secondary.columns:
+            if column.name == 'a_id': found_a = True
+            elif column.name == 'b_id': found_b = True
+        assert found_a
+        assert found_b
+    
     def test_multi_pk_in_target(self):
         class A(Entity):