From 0bf412111be686b6b23e00863f5d449d63557dbf Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Sun, 16 Feb 2025 21:35:12 -0500 Subject: Fixed #35167 -- Delegated to super() in JSONField.get_db_prep_save(). Avoids reports of bulk_update() sending Cast expressions to JSONField.get_prep_value(). Co-authored-by: Simon Charette --- tests/model_fields/models.py | 11 +++++++++++ tests/model_fields/test_jsonfield.py | 19 ++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) (limited to 'tests/model_fields') diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py index fdea06b23d..299e927615 100644 --- a/tests/model_fields/models.py +++ b/tests/model_fields/models.py @@ -430,6 +430,17 @@ class RelatedJSONModel(models.Model): required_db_features = {"supports_json_field"} +class CustomSerializationJSONModel(models.Model): + class StringifiedJSONField(models.JSONField): + def get_prep_value(self, value): + return json.dumps(value, cls=self.encoder) + + json_field = StringifiedJSONField() + + class Meta: + required_db_features = {"supports_json_field"} + + class AllFieldsModel(models.Model): big_integer = models.BigIntegerField() binary = models.BinaryField() diff --git a/tests/model_fields/test_jsonfield.py b/tests/model_fields/test_jsonfield.py index 5a9cf9ad7a..267b9a0e66 100644 --- a/tests/model_fields/test_jsonfield.py +++ b/tests/model_fields/test_jsonfield.py @@ -40,7 +40,13 @@ from django.db.models.functions import Cast from django.test import SimpleTestCase, TestCase, skipIfDBFeature, skipUnlessDBFeature from django.test.utils import CaptureQueriesContext -from .models import CustomJSONDecoder, JSONModel, NullableJSONModel, RelatedJSONModel +from .models import ( + CustomJSONDecoder, + CustomSerializationJSONModel, + JSONModel, + NullableJSONModel, + RelatedJSONModel, +) @skipUnlessDBFeature("supports_json_field") @@ -298,6 +304,17 @@ class TestSaveLoad(TestCase): obj.refresh_from_db() self.assertEqual(obj.value, value) + def test_bulk_update_custom_get_prep_value(self): + objs = CustomSerializationJSONModel.objects.bulk_create( + [CustomSerializationJSONModel(pk=1, json_field={"version": "1"})] + ) + objs[0].json_field["version"] = "1-alpha" + CustomSerializationJSONModel.objects.bulk_update(objs, ["json_field"]) + self.assertSequenceEqual( + CustomSerializationJSONModel.objects.values("json_field"), + [{"json_field": '{"version": "1-alpha"}'}], + ) + @skipUnlessDBFeature("supports_json_field") class TestQuerying(TestCase): -- cgit v1.3