django-bulk-hooks 0.2.66__py3-none-any.whl → 0.2.67__py3-none-any.whl

django_bulk_hooks/dispatcher.py

@@ -287,23 +287,36 @@ class HookDispatcher:
         """
         Preload relationships needed for condition evaluation.
 
+        This prevents N+1 queries when conditions access relationships on both
+        old_records and new_records (e.g., HasChanged conditions).
+
         Args:
             changeset: ChangeSet with records
             relationships: Set of relationship field names to preload
         """
-        if not relationships or not changeset.new_records:
+        if not relationships:
             return
 
         # Use Django's select_related to preload relationships
         relationship_list = list(relationships)
 
-        # Preload for new_records
+        # Collect all unique PKs from both new_records and old_records
+        all_ids = set()
+
+        # Add PKs from new_records
         if changeset.new_records:
-            # Use select_related on the queryset
-            ids = [obj.pk for obj in changeset.new_records if obj.pk is not None]
-            if ids:
-                preloaded = changeset.model_cls.objects.filter(pk__in=ids).select_related(*relationship_list).in_bulk()
-                # Update the objects in changeset with preloaded relationships
+            all_ids.update(obj.pk for obj in changeset.new_records if obj.pk is not None)
+
+        # Add PKs from old_records
+        if changeset.old_records:
+            all_ids.update(obj.pk for obj in changeset.old_records if obj.pk is not None)
+
+        # Bulk preload relationships for all records that have PKs
+        if all_ids:
+            preloaded = changeset.model_cls.objects.filter(pk__in=list(all_ids)).select_related(*relationship_list).in_bulk()
+
+            # Update new_records with preloaded relationships
+            if changeset.new_records:
                 for obj in changeset.new_records:
                     if obj.pk and obj.pk in preloaded:
                         preloaded_obj = preloaded[obj.pk]
@@ -311,17 +324,27 @@ class HookDispatcher:
                             if hasattr(preloaded_obj, rel):
                                 setattr(obj, rel, getattr(preloaded_obj, rel))
 
-        # Also handle unsaved objects by preloading their FK targets
-        for obj in changeset.new_records:
-            if obj.pk is None:  # Unsaved object
-                for rel in relationship_list:
-                    if hasattr(obj, f'{rel}_id'):
-                        rel_id = getattr(obj, f'{rel}_id')
-                        if rel_id:
-                            # Load the related object
-                            rel_model = getattr(changeset.model_cls._meta.get_field(rel).remote_field, 'model')
-                            rel_obj = rel_model.objects.get(pk=rel_id)
-                            setattr(obj, rel, rel_obj)
+            # Update old_records with preloaded relationships
+            if changeset.old_records:
+                for obj in changeset.old_records:
+                    if obj.pk and obj.pk in preloaded:
+                        preloaded_obj = preloaded[obj.pk]
+                        for rel in relationship_list:
+                            if hasattr(preloaded_obj, rel):
+                                setattr(obj, rel, getattr(preloaded_obj, rel))
+
+        # Handle unsaved new_records by preloading their FK targets
+        if changeset.new_records:
+            for obj in changeset.new_records:
+                if obj.pk is None:  # Unsaved object
+                    for rel in relationship_list:
+                        if hasattr(obj, f'{rel}_id'):
+                            rel_id = getattr(obj, f'{rel}_id')
+                            if rel_id:
+                                # Load the related object
+                                rel_model = getattr(changeset.model_cls._meta.get_field(rel).remote_field, 'model')
+                                rel_obj = rel_model.objects.get(pk=rel_id)
+                                setattr(obj, rel, rel_obj)
 
     def _preload_select_related_for_before_create(self, changeset, select_related_fields):
         """
@@ -336,7 +359,8 @@ class HookDispatcher:
             changeset: ChangeSet with new_records (unsaved objects)
             select_related_fields: List of field names to preload (e.g., ['financial_account'])
         """
-        if not select_related_fields or not changeset.new_records:
+        # Ensure select_related_fields is actually iterable (not a Mock in tests)
+        if not select_related_fields or not changeset.new_records or not hasattr(select_related_fields, '__iter__'):
             return
 
         logger.info(f"🔗 BULK PRELOAD: Preloading {select_related_fields} for {len(changeset.new_records)} unsaved records")

{django_bulk_hooks-0.2.66.dist-info → django_bulk_hooks-0.2.67.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.66
+Version: 0.2.67
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 License: MIT
 Keywords: django,bulk,hooks

{django_bulk_hooks-0.2.66.dist-info → django_bulk_hooks-0.2.67.dist-info}/RECORD

@@ -4,7 +4,7 @@ django_bulk_hooks/conditions.py,sha256=ar4pGjtxLKmgSIlO4S6aZFKmaBNchLtxMmWpkn4g9
 django_bulk_hooks/constants.py,sha256=PxpEETaO6gdENcTPoXS586lerGKVP3nmjpDvOkmhYxI,509
 django_bulk_hooks/context.py,sha256=mqaC5-yESDTA5ruI7fuXlt8qSgKuOFp0mjq7h1-4HdQ,1926
 django_bulk_hooks/decorators.py,sha256=TdkO4FJyFrVU2zqK6Y_6JjEJ4v3nbKkk7aa22jN10sk,11994
-django_bulk_hooks/dispatcher.py,sha256=AQXryGHVdwjFJnyek2PcjZsQM9I6fVA74WLaPJeFPSw,17157
+django_bulk_hooks/dispatcher.py,sha256=88emfa2Ae7uqBckjiodFa5E9L5lWfQLasSuEkzB4Qws,18273
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
 django_bulk_hooks/factory.py,sha256=ezrVM5U023KZqOBbJXb6lYUP-pE7WJmi8Olh2Ew-7RA,18085
 django_bulk_hooks/handler.py,sha256=SRCrMzgolrruTkvMnYBFmXLR-ABiw0JiH3605PEdCZM,4207
@@ -21,7 +21,7 @@ django_bulk_hooks/operations/mti_plans.py,sha256=HIRJgogHPpm6MV7nZZ-sZhMLUnozpZP
 django_bulk_hooks/operations/record_classifier.py,sha256=It85hJC2K-UsEOLbTR-QBdY5UPV-acQIJ91TSGa7pYo,7053
 django_bulk_hooks/queryset.py,sha256=g_9OtOTC8FXY0hBwYr2FCqQ3mYXbfJTFPLlFV3SHmWQ,5600
 django_bulk_hooks/registry.py,sha256=4HxP1mVK2z4VzvlohbEw2359wM21UJZJYagJJ1komM0,7947
-django_bulk_hooks-0.2.66.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.2.66.dist-info/METADATA,sha256=SUi-L6kewPDyuGtGMW1PMJoV_DUxHlYAMv_x0kHNT9o,9265
-django_bulk_hooks-0.2.66.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.2.66.dist-info/RECORD,,
+django_bulk_hooks-0.2.67.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.67.dist-info/METADATA,sha256=s5bxGqotVtNJFn2zykkNZA0RbEYfYH9R3cU9299G46M,9265
+django_bulk_hooks-0.2.67.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.67.dist-info/RECORD,,