Changeset 6264

Timestamp:

09/15/07 00:32:29 (8 months ago)

Author:

russellm

Message:

Fixed #4714 -- Modified serializers to handle None primary keys correctly. This slightly changes the output format for primary keys on JSON and YAML serializers (PKs will be output as 1, rather than "1". However, fixtures in the old format will still load ok. Thanks for the patch, pigletto.

Files:

• django/trunk/django/core/serializers/python.py (modified) (3 diffs)
• django/trunk/tests/modeltests/fixtures/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/serializers/models.py (modified) (6 diffs)

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

@@ -28 +28 @@
-        self.objects.append({
-            "model"  : smart_unicode(obj._meta),
-
+, strings_only=True
-            "fields" : self._current
-        })
@@ -34 +34 @@
-
-    def handle_field(self, obj, field):
-getattr(obj, field.nam
+smart_unicode(getattr(obj, field.name), strings_only=Tru
-
-    def handle_fk_field(self, obj, field):
@@ -45 +45 @@
-                # Related to remote object via other field
-                related = getattr(related, field.rel.field_name)
-related
+smart_unicode(related, strings_only=True)
-
-    def handle_m2m_field(self, obj, field):
-
+
+
-
-    def getvalue(self):

django/trunk/tests/modeltests/fixtures/models.py

@@ -75 +75 @@
-# Dump the current contents of the database as a JSON fixture
->>> management.call_command('dumpdata', 'fixtures', format='json')
-"3", "model": "fixtures.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": "2", "model": "fixtures.article", "fields": {"headline": "Poker has no place on ESPN", "pub_date": "2006-06-16 12:00:00"}}, {"pk": "1"
+3, "model": "fixtures.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": 2, "model": "fixtures.article", "fields": {"headline": "Poker has no place on ESPN", "pub_date": "2006-06-16 12:00:00"}}, {"pk": 1
-"""}
-

django/trunk/tests/modeltests/serializers/models.py

@@ +1 @@
+# -*- coding: utf-8 -*-
-"""
-41. Serialization
@@ -44 +45 @@
-    def __unicode__(self):
-        return u"Profile of %s" % self.author
+        
+class Actor(models.Model):
+    name = models.CharField(max_length=20, primary_key=True)
+
+    class Meta:
+        ordering = ('name',)
+    
+    def __unicode__(self):
+        return self.name
+    
+class Movie(models.Model):
+    actor = models.ForeignKey(Actor)
+    title = models.CharField(max_length=50)
+
+    class Meta:
+       ordering = ('title',)
+
+    def __unicode__(self):
+        return self.title
-
-__test__ = {'API_TESTS':"""
@@ -102 +122 @@
->>> json = serializers.serialize("json", Category.objects.filter(pk=2))
->>> json
-"2"
+2
-
-# You can easily create new objects by deserializing data with an empty PK
@@ -134 +154 @@
->>> json = serializers.serialize("json", AuthorProfile.objects.all())
->>> json
-"1"
+1
-
->>> for obj in serializers.deserialize("json", json):
@@ -142 +162 @@
-# Objects ids can be referenced before they are defined in the serialization data
-# However, the deserialization process will need to be contained within a transaction
-"3", "model": "serializers.article", "fields": {"headline": "Forward references pose no problem", "pub_date": "2006-06-16 15:00:00", "categories": [4, 1], "author": 4}}, {"pk": "4", "model": "serializers.category", "fields": {"name": "Reference"}}, {"pk": "4"
+3, "model": "serializers.article", "fields": {"headline": "Forward references pose no problem", "pub_date": "2006-06-16 15:00:00", "categories": [4, 1], "author": 4}}, {"pk": 4, "model": "serializers.category", "fields": {"name": "Reference"}}, {"pk": 4
->>> from django.db import transaction
->>> transaction.enter_transaction_management()
@@ -162 +182 @@
-# Serializer output can be restricted to a subset of fields
->>> print serializers.serialize("json", Article.objects.all(), fields=('headline','pub_date'))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-"""}