diff options
Diffstat (limited to 'tests')
22 files changed, 41 insertions, 21 deletions
diff --git a/tests/migrations/test_migrations_squashed_complex/1_auto.py b/tests/migrations/test_migrations_squashed_complex/1_auto.py index 25edcfa290..bf12688063 100644 --- a/tests/migrations/test_migrations_squashed_complex/1_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/1_auto.py @@ -7,5 +7,5 @@ from django.db import migrations class Migration(migrations.Migration): operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex/2_auto.py b/tests/migrations/test_migrations_squashed_complex/2_auto.py index 9107c35868..1d952ad0df 100644 --- a/tests/migrations/test_migrations_squashed_complex/2_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/2_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "1_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex/3_auto.py b/tests/migrations/test_migrations_squashed_complex/3_auto.py index 98e679fc12..d780968115 100644 --- a/tests/migrations/test_migrations_squashed_complex/3_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/3_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "2_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex/3_squashed_5.py b/tests/migrations/test_migrations_squashed_complex/3_squashed_5.py index ac1bcdee6d..f7dde03524 100644 --- a/tests/migrations/test_migrations_squashed_complex/3_squashed_5.py +++ b/tests/migrations/test_migrations_squashed_complex/3_squashed_5.py @@ -15,5 +15,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "2_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex/4_auto.py b/tests/migrations/test_migrations_squashed_complex/4_auto.py index 8fab746542..c39b16e454 100644 --- a/tests/migrations/test_migrations_squashed_complex/4_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/4_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "3_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex/5_auto.py b/tests/migrations/test_migrations_squashed_complex/5_auto.py index 5dda63aae5..754fe2d253 100644 --- a/tests/migrations/test_migrations_squashed_complex/5_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/5_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "4_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex/6_auto.py b/tests/migrations/test_migrations_squashed_complex/6_auto.py index 5ca558bc3b..65d829cd32 100644 --- a/tests/migrations/test_migrations_squashed_complex/6_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/6_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "5_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex/7_auto.py b/tests/migrations/test_migrations_squashed_complex/7_auto.py index e9f5533364..f1b3cd3e49 100644 --- a/tests/migrations/test_migrations_squashed_complex/7_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/7_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "6_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py index 25edcfa290..bf12688063 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py @@ -7,5 +7,5 @@ from django.db import migrations class Migration(migrations.Migration): operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py index dcd67ca101..13a844275b 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("app1", "1_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_squashed_3.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_squashed_3.py index d74691fe44..521e70f5d2 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_squashed_3.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_squashed_3.py @@ -14,5 +14,5 @@ class Migration(migrations.Migration): dependencies = [("app1", "1_auto"), ("app2", "2_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/3_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/3_auto.py index f2b64db833..aa0e86e560 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/3_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/3_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("app1", "2_auto"), ("app2", "2_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/4_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/4_auto.py index fa36f18566..145e495a18 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/4_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/4_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("app1", "3_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py index dcd67ca101..13a844275b 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("app1", "1_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py index fcd43bd0c6..6ef4dba71e 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py @@ -14,5 +14,5 @@ class Migration(migrations.Migration): dependencies = [("app1", "1_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py index 9743fc92a2..35fc7b8c1c 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("app2", "1_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_erroneous/1_auto.py b/tests/migrations/test_migrations_squashed_erroneous/1_auto.py index 25edcfa290..bf12688063 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/1_auto.py +++ b/tests/migrations/test_migrations_squashed_erroneous/1_auto.py @@ -7,5 +7,5 @@ from django.db import migrations class Migration(migrations.Migration): operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_erroneous/2_auto.py b/tests/migrations/test_migrations_squashed_erroneous/2_auto.py index 9107c35868..1d952ad0df 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/2_auto.py +++ b/tests/migrations/test_migrations_squashed_erroneous/2_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "1_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_erroneous/3_squashed_5.py b/tests/migrations/test_migrations_squashed_erroneous/3_squashed_5.py index ac1bcdee6d..f7dde03524 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/3_squashed_5.py +++ b/tests/migrations/test_migrations_squashed_erroneous/3_squashed_5.py @@ -15,5 +15,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "2_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_erroneous/6_auto.py b/tests/migrations/test_migrations_squashed_erroneous/6_auto.py index 5ca558bc3b..65d829cd32 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/6_auto.py +++ b/tests/migrations/test_migrations_squashed_erroneous/6_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "5_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_migrations_squashed_erroneous/7_auto.py b/tests/migrations/test_migrations_squashed_erroneous/7_auto.py index e9f5533364..f1b3cd3e49 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/7_auto.py +++ b/tests/migrations/test_migrations_squashed_erroneous/7_auto.py @@ -9,5 +9,5 @@ class Migration(migrations.Migration): dependencies = [("migrations", "6_auto")] operations = [ - migrations.RunPython(lambda apps, schema_editor: None) + migrations.RunPython(migrations.RunPython.noop) ] diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py index 90ec456f84..f3e33b0f7e 100644 --- a/tests/migrations/test_operations.py +++ b/tests/migrations/test_operations.py @@ -1494,6 +1494,15 @@ class OperationTests(OperationTestBase): operation.database_backwards, "test_runsql", editor, new_state, project_state) + def test_run_sql_noop(self): + """ + #24098 - Tests no-op RunSQL operations. + """ + operation = migrations.RunSQL(migrations.RunSQL.noop, migrations.RunSQL.noop) + with connection.schema_editor() as editor: + operation.database_forwards("test_runsql", editor, None, None) + operation.database_backwards("test_runsql", editor, None, None) + def test_run_python(self): """ Tests the RunPython operation @@ -1620,6 +1629,17 @@ class OperationTests(OperationTestBase): self.assertEqual(definition[1], []) self.assertEqual(sorted(definition[2]), ["atomic", "code"]) + def test_run_python_noop(self): + """ + #24098 - Tests no-op RunPython operations. + """ + project_state = ProjectState() + new_state = project_state.clone() + operation = migrations.RunPython(migrations.RunPython.noop, migrations.RunPython.noop) + with connection.schema_editor() as editor: + operation.database_forwards("test_runpython", editor, project_state, new_state) + operation.database_backwards("test_runpython", editor, new_state, project_state) + @unittest.skipIf(sqlparse is None and connection.features.requires_sqlparse_for_splitting, "Missing sqlparse") def test_separate_database_and_state(self): """ |