Default field value is now "null", or None if null=True

Author: derek-schaefer

README.rst

@@ -59,7 +59,7 @@ Add a ``JSONField`` to your model like any other field.
 
 ``JSONField`` also has a few additional optional parameters.
 
- - ``default``: Falls back on ``{}`` if not provided.
+ - ``default``: Falls back on ``"null"`` if not provided
  - ``db_type``: Allows you to specify the column type (default: ``text``)
  - ``encoder``: Custom JSON encoder (default: ``DjangoJSONEncoder``)
  - ``decoder``: Custom JSON decoder (default: ``json_field.fields.JSONDecoder``)

json_field/fields.py

@@ -75,7 +75,7 @@ def __init__(self, *args, **kwargs):
             decoder_kwargs.update({'cls':decoder})
         self.encoder_kwargs = encoder_kwargs
         self.decoder_kwargs = decoder_kwargs
-        kwargs['default'] = kwargs.get('default', {} if not kwargs.get('null') else None)
+        kwargs['default'] = kwargs.get('default', 'null')
         kwargs['help_text'] = kwargs.get('help_text', self.default_error_messages['invalid'])
         super(JSONField, self).__init__(*args, **kwargs)
 

test_project/app/tests.py

@@ -72,8 +72,8 @@ def test_get_set_json(self):
         self.assertEqual({'test':123}, t1.json)
         self.assertEqual('{"test": 123}', t1.get_json_json())
         t2 = Test.objects.create()
-        self.assertEqual({}, t2.json)
-        self.assertEqual('{}', t2.get_json_json())
+        self.assertEqual(None, t2.json)
+        self.assertEqual('null', t2.get_json_json())
         self.assertEqual(None, t2.json_null)
         self.assertEqual('null', t2.get_json_null_json())
         t3 = Test.objects.create(json=[1,2,3])