Merge branch 'pr1139'

CONTRIBUTING.rst

@@ -63,6 +63,3 @@ With that out of the way, we hope to hear from you soon.
 .. _blueprints: https://drf-spectacular.readthedocs.io/en/latest/blueprints.html
 .. _early feedback: https://github.com/tfranzel/drf-spectacular/issues
 .. _test_regressions.py: https://github.com/tfranzel/drf-spectacular/blob/master/tests/test_regressions.py
-
-
-

drf_spectacular/plumbing.py

@@ -535,7 +535,7 @@ def append_meta(schema: _SchemaType, meta: _SchemaType) -> _SchemaType:
                 schema = {'oneOf': [schema, {'type': 'null'}]}
             elif len(schema) == 1 and 'oneOf' in schema:
                 schema['oneOf'].append({'type': 'null'})
-            elif not schema and not meta:
+            elif not schema:
                 schema = {'oneOf': [{}, {'type': 'null'}]}
             else:
                 assert False, 'Invalid nullable case'  # pragma: no cover

tests/test_regressions.py

@@ -3267,6 +3267,7 @@ def view_func(request, format=None):
 def test_basic_oas_3_1_nullable_cases(no_warnings, django_transforms):
     class M14(models.Model):
         field_json = models.JSONField(null=True)  # case 1
+        field_json2 = models.JSONField(null=True, help_text="field_json desc")  # case 3
 
     class XSerializer(serializers.ModelSerializer):
 
@@ -3287,6 +3288,7 @@ class XViewset(viewsets.ReadOnlyModelViewSet):
     assert schema['components']['schemas']['X']['properties'] == {
         'id': {'readOnly': True, 'type': 'integer'},
         'field_json': {'oneOf': [{}, {'type': 'null'}]},
+        'field_json2': {'oneOf': [{}, {'type': 'null'}], 'description': 'field_json desc'},
         'field_method_hint': {
             'oneOf': [
                 {'type': 'integer'},