Changeset 240

Timestamp:

10/23/07 18:20:28 (6 years ago)

Author:

ged

Message:

- Added the possibility to give a custom name for ManyToOne constraints

(patch from and closes ticket #16)

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/relationships.py (modified) (1 diff)

elixir/trunk/CHANGES

@@ -61 +61 @@
   mapper option so that it can actually be used. This allows to have entities
   without any primary key defined at the table level.
+- Added the possibility to give a custom name for ManyToOne constraints
+  (patch from and closes ticket #16)
 - Dropped support for the old threadlocal SA extension (which doesn't even exist
   anymore in SA 0.4)

elixir/trunk/elixir/relationships.py

@@ -570 +570 @@
 
                 # build up the primary join. This is needed when you have 
-                # several belongs_to relations between two objects
+                # several belongs_to relationships between two objects
                 self.primaryjoin_clauses.append(col == pk_col)
             
-            # In some databases (at lease MySQL) the constraint name needs to 
-            # be unique for the whole database, instead of per table.
-            fk_name = "%s_%s_fk" % (source_desc.tablename, 
-                                    '_'.join(fk_colnames))
+            if 'name' not in self.constraint_kwargs:
+                # In some databases (at least MySQL) the constraint name needs
+                # to be unique for the whole database, instead of per table.
+                fk_name = "%s_%s_fk" % (source_desc.tablename, 
+                                        '_'.join(fk_colnames))
+                self.constraint_kwargs['name'] = fk_name
+                
             source_desc.add_constraint(
-                ForeignKeyConstraint(fk_colnames, fk_refcols, name=fk_name,
+                ForeignKeyConstraint(fk_colnames, fk_refcols,
                                      **self.constraint_kwargs))