django-bulk-hooks 0.2.66__tar.gz → 0.2.67__tar.gz

{django_bulk_hooks-0.2.66 → django_bulk_hooks-0.2.67}/PKG-INFO

@@ -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 → django_bulk_hooks-0.2.67}/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 → django_bulk_hooks-0.2.67}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.2.66"
+version = "0.2.67"
 description = "Hook-style hooks for Django bulk operations like bulk_create and bulk_update."
 authors = ["Konrad Beck <konrad.beck@merchantcapital.co.za>"]
 readme = "README.md"