Changeset 8

Timestamp:

01/30/07 16:44:57 (6 years ago)

Author:

cleverdevil

Message:

Added support for specifying the table name for the mapping table on many to
many relationships by passing a 'table_name' keyword argument.

We still need to figure out what to do when the user fails to specify the
table name on one side of the relationship, or specifies different table
names.

Files:

• supermodel/trunk/supermodel/relationships.py (modified) (2 diffs)

supermodel/trunk/supermodel/relationships.py

@@ -236 +236 @@
 
 class HasAndBelongsToMany(Relationship):
+    
+    def __init__(self, entity, name, *args, **kwargs):
+        self.tablename = kwargs.pop('table_name', None)
+        super(HasAndBelongsToMany, self).__init__(entity, name, *args, **kwargs)
+    
     def create_tables(self):
         if self.inverse:
@@ -297 +302 @@
             # (instead of the inverse relation's name) so that a many-to-many
             # relation can be defined without inverse.
-            e2_pk_name = '_'.join([key.column.name for key in
-                                   e2_desc.primary_keys])
-            tablename = "%s_%s__%s_%s" % (e1_desc.tablename, self.name,
-                                          e2_desc.tablename, e2_pk_name)
+            if not self.tablename:
+                e2_pk_name = '_'.join([key.column.name for key in
+                                       e2_desc.primary_keys])
+                tablename = "%s_%s__%s_%s" % (e1_desc.tablename, self.name,
+                                              e2_desc.tablename, e2_pk_name)
+            else:
+                tablename = self.tablename
 
             args = columns + constraints