mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 11:39:13 +00:00
Code Issues 32 Releases Wiki Activity

[5.0.x] Fixed #34984 -- Skipped GeneratedFields when remaking tables on SQLite.

Browse Source 
Regression in f333e3513e8bdf5ffeb6eeb63021c230082e6f95.t

Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Co-authored-by: David Sanders <shang.xiao.sanders@gmail.com>

Backport of 828082dad954e87d09a99b53424e6faa1860ccc7 from main
This commit is contained in:
Sarah Boyce 2023-11-22 10:01:23 +01:00 committed by Mariusz Felisiak
parent 6692b0ecce
commit 0c6ca52226
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/sqlite3/schema.py
View File

@ -107,6 +107,7 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
mapping = { mapping = {
f.column: self.quote_name(f.column) f.column: self.quote_name(f.column)
for f in model._meta.local_concrete_fields for f in model._meta.local_concrete_fields
if f.generated is False
} }
# This maps field names (not columns) for things like unique_together # This maps field names (not columns) for things like unique_together
rename_mapping = {} rename_mapping = {}
@ -163,7 +164,7 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
# Remove any deleted fields # Remove any deleted fields
if delete_field: if delete_field:
del body[delete_field.name] del body[delete_field.name]
del mapping[delete_field.column] mapping.pop(delete_field.column, None)
# Remove any implicit M2M tables # Remove any implicit M2M tables
if ( if (
delete_field.many_to_many delete_field.many_to_many

36
tests/migrations/test_operations.py
View File

@ -5935,6 +5935,42 @@ class OperationTests(OperationTestBase):
def test_remove_generated_field_virtual(self): def test_remove_generated_field_virtual(self):
self._test_remove_generated_field(db_persist=False) self._test_remove_generated_field(db_persist=False)
@skipUnlessDBFeature("supports_stored_generated_columns")
def test_add_field_after_generated_field(self):
app_label = "test_adfagf"
project_state = self.set_up_test_model(app_label)
operation_1 = migrations.AddField(
"Pony",
"generated",
models.GeneratedField(
expression=Value(1),
output_field=models.IntegerField(),
db_persist=True,
),
)
operation_2 = migrations.AddField(
"Pony",
"static",
models.IntegerField(default=2),
)
new_state = project_state.clone()
operation_1.state_forwards(app_label, new_state)
with connection.schema_editor() as editor:
operation_1.database_forwards(app_label, editor, project_state, new_state)
project_state, new_state = new_state, new_state.clone()
pony_old = new_state.apps.get_model(app_label, "Pony").objects.create(weight=20)
self.assertEqual(pony_old.generated, 1)
operation_2.state_forwards(app_label, new_state)
with connection.schema_editor() as editor:
operation_2.database_forwards(app_label, editor, project_state, new_state)
Pony = new_state.apps.get_model(app_label, "Pony")
pony_old = Pony.objects.get(pk=pony_old.pk)
self.assertEqual(pony_old.generated, 1)
self.assertEqual(pony_old.static, 2)
pony_new = Pony.objects.create(weight=20)
self.assertEqual(pony_new.generated, 1)
self.assertEqual(pony_new.static, 2)
class SwappableOperationTests(OperationTestBase): class SwappableOperationTests(OperationTestBase):
""" """