Fix #53 -- Address improper handling of rename operation questioning.

charettes · Jan 24, 2025 · a8b6fa8 · a8b6fa8
1 parent 3c8cbaa
commit a8b6fa8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,7 @@
 - Add support for Django 5.2 and Python 3.13.
 - Drop support for Python 3.8.
 - Ensure staged renames and alters are properly serialized. (#52)
+- Address improper handling of rename operation questioning. (#53)
 
 1.1.0
 =====

diff --git a/syzygy/autodetector.py b/syzygy/autodetector.py
@@ -88,7 +88,7 @@ def add_operation(self, app_label, operation, dependencies=None, beginning=False
                 ),
                 file=sys.stderr,
             )
-            choice = self.questioner.defaults.get("ask_rename_field_stage", 0)
+            choice = self.questioner.defaults.get("ask_rename_field_stage", 1)
             if self.has_interactive_questionner:
                 choice = self.questioner._choice_input(
                     "Please choose an appropriate action to take:",
@@ -113,10 +113,10 @@ def add_operation(self, app_label, operation, dependencies=None, beginning=False
                         ),
                     ],
                 )
-            if choice == 0:
+            if choice == 1:
                 sys.exit(3)
             else:
-                stage = Stage.PRE_DEPLOY if choice == 1 else Stage.POST_DEPLOY
+                stage = Stage.PRE_DEPLOY if choice == 2 else Stage.POST_DEPLOY
                 operation = RenameField.for_stage(operation, stage)
         if isinstance(operation, operations.RenameModel):
             from_db_table = (
@@ -135,7 +135,7 @@ def add_operation(self, app_label, operation, dependencies=None, beginning=False
                     ),
                     file=sys.stderr,
                 )
-                choice = self.questioner.defaults.get("ask_rename_model_stage", 0)
+                choice = self.questioner.defaults.get("ask_rename_model_stage", 1)
                 if self.has_interactive_questionner:
                     choice = self.questioner._choice_input(
                         "Please choose an appropriate action to take:",
@@ -161,10 +161,10 @@ def add_operation(self, app_label, operation, dependencies=None, beginning=False
                             ),
                         ],
                     )
-                if choice == 0:
+                if choice == 1:
                     sys.exit(3)
                 else:
-                    stage = Stage.PRE_DEPLOY if choice == 1 else Stage.POST_DEPLOY
+                    stage = Stage.PRE_DEPLOY if choice == 2 else Stage.POST_DEPLOY
                     operation = RenameModel.for_stage(operation, stage)
         elif isinstance(operation, operations.AlterField) and not operation.field.null:
             # Addition of not-NULL constraints must be performed post-deployment.

diff --git a/tests/test_autodetector.py b/tests/test_autodetector.py
@@ -230,14 +230,14 @@ def test_field_rename(self):
         with captured_stderr(), self.assertRaisesMessage(SystemExit, "3"):
             self.get_changes(from_models, to_models, questioner)["tests"]
         # Pre-deploy rename.
-        questioner.defaults["ask_rename_field_stage"] = 1
+        questioner.defaults["ask_rename_field_stage"] = 2
         with captured_stderr():
             changes = self.get_changes(from_models, to_models, questioner)["tests"]
         self.assertEqual(len(changes), 1)
         self.assertEqual(get_migration_stage(changes[0]), Stage.PRE_DEPLOY)
         self.assertIsInstance(changes[0].operations[0], RenameField)
         # Post-deploy rename.
-        questioner.defaults["ask_rename_field_stage"] = 2
+        questioner.defaults["ask_rename_field_stage"] = 3
         with captured_stderr():
             changes = self.get_changes(from_models, to_models, questioner)["tests"]
         self.assertEqual(len(changes), 1)
@@ -271,14 +271,14 @@ def test_model_rename(self):
         with captured_stderr(), self.assertRaisesMessage(SystemExit, "3"):
             self.get_changes(from_models, to_models, questioner)["tests"]
         # Pre-deploy rename.
-        questioner.defaults["ask_rename_model_stage"] = 1
+        questioner.defaults["ask_rename_model_stage"] = 2
         with captured_stderr():
             changes = self.get_changes(from_models, to_models, questioner)["tests"]
         self.assertEqual(len(changes), 1)
         self.assertEqual(get_migration_stage(changes[0]), Stage.PRE_DEPLOY)
         self.assertIsInstance(changes[0].operations[0], RenameModel)
         # Post-deploy rename.
-        questioner.defaults["ask_rename_model_stage"] = 2
+        questioner.defaults["ask_rename_model_stage"] = 3
         with captured_stderr():
             changes = self.get_changes(from_models, to_models, questioner)["tests"]
         self.assertEqual(len(changes), 1)