Changeset 5232

Timestamp:

05/14/07 09:14:49 (2 years ago)

Author:

russellm

Message:

Fixed #4288 -- Modified serializers to pay attention to the to_field attribute on ForeignKeys?. Thanks to Sandro Dentella for the report and the helpful test case.

Files:

• django/trunk/django/core/management.py (modified) (2 diffs)
• django/trunk/django/core/serializers/python.py (modified) (2 diffs)
• django/trunk/django/core/serializers/xml_serializer.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/serializers_regress/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/serializers_regress/tests.py (modified) (1 diff)

django/trunk/django/core/management.py

@@ -1405 +1405 @@
-                        print "No %s fixture '%s' in %s." % \
-                            (format, fixture_name, humanize(fixture_dir))
+                            
+    sequence_sql = backend.get_sql_sequence_reset(style, models)
+    if sequence_sql:
+        if verbosity > 1:
+            print "Resetting sequences"
+        for line in sequence_sql:
+            cursor.execute(line)
+            
+    transaction.commit()
+    transaction.leave_transaction_management()
+    
-    if count[0] == 0:
-        if verbosity > 0:
@@ -1411 +1422 @@
-        if verbosity > 0:
-            print "Installed %d object(s) from %d fixture(s)" % tuple(count)
-        sequence_sql = backend.get_sql_sequence_reset(style, models)
-        if sequence_sql:
-            if verbosity > 1:
-                print "Resetting sequences"
-            for line in sequence_sql:
-                cursor.execute(line)
-    transaction.commit()
-    transaction.leave_transaction_management()
-
-load_data.help_doc = 'Installs the named fixture(s) in the database'

django/trunk/django/core/serializers/python.py

@@ -38 +38 @@
-        related = getattr(obj, field.name)
-        if related is not None:
-related._get_pk_val(
+getattr(related, field.rel.field_name
-        self._current[field.name] = related
-    
@@ -81 +81 @@
-            # Handle FK fields
-            elif field.rel and isinstance(field.rel, models.ManyToOneRel):
-
+
+
+
+
-                    
-            # Handle all other fields

django/trunk/django/core/serializers/xml_serializer.py

@@ -83 +83 @@
-        related = getattr(obj, field.name)
-        if related is not None:
-related._get_pk_val(
+getattr(related, field.rel.field_name
-        else:
-            self.xml.addQuickElement("None")
@@ -182 +182 @@
-            return None
-        else:
-pk
+get_field(field.rel.field_name)
-                       getInnerText(node).strip().encode(self.encoding))
-        

django/trunk/tests/regressiontests/serializers_regress/models.py

@@ -117 +117 @@
-    data = models.ManyToManyField('self', null=True, symmetrical=False)
-
+
+class UniqueAnchor(models.Model):
+    """This is a model that can be used as 
+    something for other models to point at"""
+
+    data = models.CharField(unique=True, maxlength=30)
+
+class FKDataToField(models.Model):
+    data = models.ForeignKey(UniqueAnchor, null=True, to_field='data')
+
-# The following test classes are for validating the
-# deserialization of objects that use a user-defined

django/trunk/tests/regressiontests/serializers_regress/tests.py

@@ -185 +185 @@
-    (m2m_obj, 446, M2MSelfData, []),
-
+    (data_obj, 450, UniqueAnchor, "UAnchor 1"),
+    (fk_obj, 451, FKDataToField, "UAnchor 1"),
+    (fk_obj, 452, FKDataToField, "UAnchor 2"),
+    (fk_obj, 453, FKDataToField, None),
+    (data_obj, 454, UniqueAnchor, "UAnchor 2"),
+    
-    (data_obj, 500, Anchor, "Anchor 3"),
-    (data_obj, 501, Anchor, "Anchor 4"),