Changeset 405

Timestamp:

10/01/08 12:00:47 (5 years ago)

Author:

ged

Message:

Added a new "target_column" argument on ManyToOne relationships (ticket #26).
This is harder than I initially thought: it breaks if the target is declared
after the class holding the ManyToOne.

Location:

elixir/trunk

Files:

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

elixir/trunk/CHANGES

@@ -20 +20 @@
   ManyToMany table in a custom schema and not necessarily the same schema as
   the table of the "source" entity (patch from Diez B. Roggisch).
+- Added a new "target_column" argument on ManyToOne relationships (ticket #26).
+  TODOC
 
 Changes:

elixir/trunk/elixir/relationships.py

@@ -543 +543 @@
         self.primaryjoin_clauses = list()
 
+        self.target_column = kwargs.pop('target_column', None)
+        if self.target_column is not None and \
+           not isinstance(self.target_column, list):
+            self.target_column = [self.target_column]
+
         super(ManyToOne, self).__init__(*args, **kwargs)
 
@@ -601 +606 @@
         # - the name of the target table
         target_desc = self.target._descriptor
-        #make sure the target has all its pk setup up
+        #make sure the target has all its pk set up
+#ca craint
         target_desc.create_pk_cols()
 
@@ -625 +631 @@
             fk_colnames = list()
 
+            if self.target_column is None:
+                target_columns = target_desc.primary_keys
+            else:
+                target_columns = [target_desc.get_column(col)
+                                  for col in self.target_column]
+
+            if not target_columns:
+                raise Exception("No primary key found in target table ('%s') "
+                                "for the '%s' relationship of the '%s' entity."
+                                % (self.target.tablename, self.name,
+                                   self.entity.__name__))
             if self.colname and \
-               len(self.colname) != len(target_desc.primary_keys):
+               len(self.colname) != len(target_columns):
                 raise Exception(
                         "The number of column names provided in the colname "
@@ -635 +652 @@
                            self.target.__name__))
 
-            pks = target_desc.primary_keys
-            if not pks:
-                raise Exception("No primary key found in target table ('%s') "
-                                "for the '%s' relationship of the '%s' entity."
-                                % (self.target.tablename, self.name,
-                                   self.entity.__name__))
-
-            for key_num, pk_col in enumerate(pks):
+            for key_num, target_col in enumerate(target_columns):
                 if self.field:
                     col = self.field[key_num].column
@@ -651 +661 @@
                         colname = options.FKCOL_NAMEFORMAT % \
                                   {'relname': self.name,
-                                   'key': pk_col.key}
+                                   'key': target_col.key}
 
                     # We can't add the column to the table directly as the
                     # table might not be created yet.
-                    col = Column(colname, pk_col.type, **self.column_kwargs)
+                    col = Column(colname, target_col.type,
+                                 **self.column_kwargs)
                     source_desc.add_column(col)
 
@@ -680 +691 @@
                 # point to
                 fk_refcols.append("%s.%s" % \
-                                  (target_desc.table_fullname, pk_col.key))
+                                  (target_desc.table_fullname, target_col.key))
 
                 # Build up the primary join. This is needed when you have
                 # several belongs_to relationships between two objects
-                self.primaryjoin_clauses.append(col == pk_col)
+                self.primaryjoin_clauses.append(col == target_col)
 
             if 'name' not in self.constraint_kwargs:

elixir/trunk/tests/test_m2o.py

@@ -201 +201 @@
         assert a2 == b1.a_rel2
 
+    def test_non_pk_target(self):
+        class A(Entity):
+            name = Field(String(60), unique=True)
+
+        class B(Entity):
+            name = Field(String(60))
+            a = ManyToOne('A', target_column=['id', 'name'])
+# currently fails
+#            c = ManyToOne('C', target_column=['id', 'name'])
+
+#        class C(Entity):
+#            name = Field(String(60), unique=True)
+
+        setup_all(True)
+
+        b1 = B(name='b1', a=A(name='a1'))
+
+        session.commit()
+        session.clear()
+
+        b = B.query.one()
+
+        assert b.a.name == 'a1'
+
     def test_belongs_to_syntax(self):
         class Person(Entity):