Browse Source

Reverted "Refs #30446, Refs #34944 -- Fixed crash when adding GeneratedField with string Value()."

This reverts commit 8b1acc0440418ac8f45ba48e2dfcf5126c83341b.
Mariusz Felisiak 1 year ago
parent
commit
de4884b114
3 changed files with 1 additions and 19 deletions
  1. 1 1
      django/db/models/expressions.py
  2. 0 1
      tests/expressions/tests.py
  3. 0 17
      tests/schema/tests.py

+ 1 - 1
django/db/models/expressions.py

@@ -1082,7 +1082,7 @@ class Value(SQLiteNumericMixin, Expression):
 
     def _resolve_output_field(self):
         if isinstance(self.value, str):
-            return fields.CharField(max_length=len(self.value))
+            return fields.CharField()
         if isinstance(self.value, bool):
             return fields.BooleanField()
         if isinstance(self.value, int):

+ 0 - 1
tests/expressions/tests.py

@@ -2227,7 +2227,6 @@ class ValueTests(TestCase):
             with self.subTest(type=type(value)):
                 expr = Value(value)
                 self.assertIsInstance(expr.output_field, output_field_type)
-        self.assertEqual(Value("foo").output_field.max_length, 3)
 
     def test_resolve_output_field_failure(self):
         msg = "Cannot resolve expression type, unknown output_field"

+ 0 - 17
tests/schema/tests.py

@@ -842,23 +842,6 @@ class SchemaTests(TransactionTestCase):
             False,
         )
 
-    @isolate_apps("schema")
-    @skipUnlessDBFeature("supports_stored_generated_columns")
-    def test_add_generated_field_with_string_value(self):
-        class GeneratedFieldStringValueModel(Model):
-            value = GeneratedField(expression=Value("static string"), db_persist=True)
-
-            class Meta:
-                app_label = "schema"
-
-        with CaptureQueriesContext(connection) as ctx:
-            with connection.schema_editor() as editor:
-                editor.create_model(GeneratedFieldStringValueModel)
-        self.assertIs(
-            any("None" in query["sql"] for query in ctx.captured_queries),
-            False,
-        )
-
     @isolate_apps("schema")
     @skipUnlessDBFeature("supports_stored_generated_columns")
     def test_add_generated_field_with_output_field(self):