From 81663cc4ca8f7ac0eac33cbb6986462330e75bb1 Mon Sep 17 00:00:00 2001 From: Paolo Melchiorre Date: Fri, 22 Sep 2023 11:27:40 +0200 Subject: [5.0.x] Fixed #34861 -- Fixed crash when adding GeneratedField with some expressions. Co-authored-by: Simon Charette Backport of 574ee4023e15cfb195833edfbaed353f8021c62f from main --- tests/schema/tests.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/schema/tests.py b/tests/schema/tests.py index 9f620331bc..cc92e250a1 100644 --- a/tests/schema/tests.py +++ b/tests/schema/tests.py @@ -32,6 +32,7 @@ from django.db.models import ( FloatField, ForeignKey, ForeignObject, + GeneratedField, Index, IntegerField, JSONField, @@ -50,7 +51,7 @@ from django.db.models import ( UUIDField, Value, ) -from django.db.models.fields.json import KeyTextTransform +from django.db.models.fields.json import KT, KeyTextTransform from django.db.models.functions import Abs, Cast, Collate, Lower, Random, Upper from django.db.models.indexes import IndexExpression from django.db.transaction import TransactionManagementError, atomic @@ -816,6 +817,24 @@ class SchemaTests(TransactionTestCase): # Introspection treats BLOBs as TextFields self.assertEqual(columns["bits"][0], "TextField") + @isolate_apps("schema") + @skipUnlessDBFeature("supports_json_field", "supports_stored_generated_columns") + def test_add_generated_field_with_kt_model(self): + class GeneratedFieldKTModel(Model): + data = JSONField() + status = GeneratedField(expression=KT("data__status"), db_persist=True) + + class Meta: + app_label = "schema" + + with CaptureQueriesContext(connection) as ctx: + with connection.schema_editor() as editor: + editor.create_model(GeneratedFieldKTModel) + self.assertIs( + any("None" in query["sql"] for query in ctx.captured_queries), + False, + ) + @isolate_apps("schema") def test_add_auto_field(self): class AddAutoFieldModel(Model): -- cgit v1.3