fix: evaluate skip_validation at runtime in BaseModel.save()

The default parameter `skip_validation = not settings.V3_FEATURE_LOCATIONS`
was evaluated once at class definition time (import). This caused different
query counts between local dev (V3=False at startup) and CI (V3=True at
startup), because @override_settings in tests could not affect the already
baked-in default. Changed to evaluate at runtime so full_clean() validation
runs correctly based on the active setting.

Author: valentijnscholten

dojo/base_models/base.py

@@ -42,7 +42,7 @@ class Meta:
 
         abstract = True
 
-    def save(self, *args: list, skip_validation: bool = not settings.V3_FEATURE_LOCATIONS, **kwargs: dict) -> None:
+    def save(self, *args: list, skip_validation: bool | None = None, **kwargs: dict) -> None:
         """
         Override save method to call the `full_clean()` validation function each save.
 
@@ -53,6 +53,9 @@ def save(self, *args: list, skip_validation: bool = not settings.V3_FEATURE_LOCA
         - Validate the field uniqueness - `validate_unique()`
         All three steps are performed when you call a model's full_clean() method in the order above
         """
+        # make sure this is evaluated at runtime, not at class definition time which would be the case if we used it in the parameter default value
+        if skip_validation is None:
+            skip_validation = not settings.V3_FEATURE_LOCATIONS
         # Run the pre save logic, if enabled
         self.pre_save_logic()
         # Call the validations

unittests/test_importers_performance.py

@@ -518,11 +518,11 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
         configure_pghistory_triggers()
 
         self._import_reimport_performance(
-            expected_num_queries1=1017,
+            expected_num_queries1=1225,
             expected_num_async_tasks1=6,
-            expected_num_queries2=669,
+            expected_num_queries2=715,
             expected_num_async_tasks2=17,
-            expected_num_queries3=344,
+            expected_num_queries3=345,
             expected_num_async_tasks3=16,
         )
 
@@ -540,11 +540,11 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self._import_reimport_performance(
-            expected_num_queries1=1024,
+            expected_num_queries1=1232,
             expected_num_async_tasks1=6,
-            expected_num_queries2=676,
+            expected_num_queries2=722,
             expected_num_async_tasks2=17,
-            expected_num_queries3=351,
+            expected_num_queries3=352,
             expected_num_async_tasks3=16,
         )
 
@@ -563,11 +563,11 @@ def test_import_reimport_reimport_performance_pghistory_no_async_with_product_gr
         self.system_settings(enable_product_grade=True)
 
         self._import_reimport_performance(
-            expected_num_queries1=1031,
+            expected_num_queries1=1242,
             expected_num_async_tasks1=8,
-            expected_num_queries2=683,
+            expected_num_queries2=732,
             expected_num_async_tasks2=19,
-            expected_num_queries3=355,
+            expected_num_queries3=356,
             expected_num_async_tasks3=18,
         )
 
@@ -661,9 +661,9 @@ def test_deduplication_performance_pghistory_async(self):
         self.system_settings(enable_deduplication=True)
 
         self._deduplication_performance(
-            expected_num_queries1=1192,
+            expected_num_queries1=1445,
             expected_num_async_tasks1=7,
-            expected_num_queries2=865,
+            expected_num_queries2=1016,
             expected_num_async_tasks2=7,
             check_duplicates=False,  # Async mode - deduplication happens later
         )
@@ -681,8 +681,8 @@ def test_deduplication_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self._deduplication_performance(
-            expected_num_queries1=1199,
+            expected_num_queries1=1452,
             expected_num_async_tasks1=7,
-            expected_num_queries2=1138,
+            expected_num_queries2=1289,
             expected_num_async_tasks2=7,
         )