Ticket #2843: include_reverse_relations.3.diff

django/core/serializers/xml_serializer.py

@@ -5 +5 @@
 from django.conf import settings
 from django.core.serializers import base
 from django.db import models, DEFAULT_DB_ALIAS
+from django.db.models.fields.related import OneToOneRel
 from django.utils.xmlutils import SimplerXMLGenerator
 from django.utils.encoding import smart_unicode
 from xml.dom import pulldom
@@ -131 +132 @@
 
             self.xml.endElement("field")
 
+    def handle_o2m_field(self, obj, field):
+        if not isinstance(field.field.rel, OneToOneRel):
+            self.xml.startElement("field", {
+                "name" : field.get_accessor_name(),
+                "rel"  : field.field.rel.__class__.__name__,
+                "to"   : field.field.name,
+            })
+            for relobj in getattr(obj, field.get_accessor_name()).iterator():
+                self.xml.addQuickElement("object", attrs={"pk" : str(relobj._get_pk_val())})
+            self.xml.endElement("field")
+
     def _start_relational_field(self, field):
         """
         Helper to output the <field> element for relational fields

django/core/serializers/base.py

@@ -38 +38 @@
         self.selected_fields = options.pop("fields", None)
         self.use_natural_keys = options.pop("use_natural_keys", False)
 
+        self.include_reverse_relations = options.get("include_reverse_relations", False)
+        if self.options.has_key("include_reverse_relations"):
+            del self.options["include_reverse_relations"]
+
         self.start_serialization()
         for obj in queryset:
             self.start_object(obj)
@@ -56 +60 @@
                 if field.serialize:
                     if self.selected_fields is None or field.attname in self.selected_fields:
                         self.handle_m2m_field(obj, field)
+            if self.include_reverse_relations:
+                for field in concrete_model._meta.get_all_related_objects():
+                    self.handle_o2m_field(obj, field)
             self.end_object(obj)
         self.end_serialization()
         return self.getvalue()
@@ -102 +109 @@
         """
         raise NotImplementedError
 
+    def handle_o2m_field(self, obj, field):
+        """
+        Called to handle a OneToManyField.
+        """
+        raise NotImplementedError
+
     def getvalue(self):
         """
         Return the fully serialized queryset (or None if the output stream is

django/core/serializers/python.py

@@ -7 +7 @@
 from django.conf import settings
 from django.core.serializers import base
 from django.db import models, DEFAULT_DB_ALIAS
+from django.db.models.fields.related import OneToOneRel
 from django.utils.encoding import smart_unicode, is_protected_type
 
 class Serializer(base.Serializer):
@@ -64 +65 @@
             self._current[field.name] = [m2m_value(related)
                                for related in getattr(obj, field.name).iterator()]
 
+    def handle_o2m_field(self, obj, field):
+        if not isinstance(field.field.rel, OneToOneRel):
+            self._current[field.get_accessor_name()] = [related._get_pk_val() for related in getattr(obj, field.get_accessor_name()).iterator()]
+
     def getvalue(self):
         return self.objects