Changeset 297 for elixir/trunk/elixir/relationships.py

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.

Files:

• elixir/trunk/elixir/relationships.py (modified) (3 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