django-bulk-hooks 0.1.242__tar.gz → 0.1.244__tar.gz

{django_bulk_hooks-0.1.242 → django_bulk_hooks-0.1.244}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.242
+Version: 0.1.244
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 Home-page: https://github.com/AugendLimited/django-bulk-hooks
 License: MIT

{django_bulk_hooks-0.1.242 → django_bulk_hooks-0.1.244}/django_bulk_hooks/queryset.py

@@ -125,41 +125,53 @@ class HookQuerySetMixin:
         # to in-memory instances before running BEFORE_UPDATE hooks. Hooks must not
         # receive unresolved expression objects.
         per_object_values = get_bulk_update_value_map()
-        for obj in instances:
-            if per_object_values and obj.pk in per_object_values:
-                for field, value in per_object_values[obj.pk].items():
-                    setattr(obj, field, value)
-            else:
-                for field, value in kwargs.items():
-                    # Skip assigning expression-like objects (they will be handled at DB level)
-                    is_subquery = isinstance(value, Subquery)
-                    is_expression_like = hasattr(value, "resolve_expression")
-                    if is_subquery or is_expression_like:
-                        # Special-case Value() which can be unwrapped safely
-                        if isinstance(value, Value):
-                            try:
-                                setattr(obj, field, value.value)
-                            except Exception:
-                                # If Value cannot be unwrapped for any reason, skip assignment
+
+        # For Subquery updates, skip all in-memory field assignments to prevent
+        # expression objects from reaching hooks
+        if has_subquery:
+            logger.debug(
+                "Skipping in-memory field assignments due to Subquery detection"
+            )
+        else:
+            for obj in instances:
+                if per_object_values and obj.pk in per_object_values:
+                    for field, value in per_object_values[obj.pk].items():
+                        setattr(obj, field, value)
+                else:
+                    for field, value in kwargs.items():
+                        # Skip assigning expression-like objects (they will be handled at DB level)
+                        is_expression_like = hasattr(value, "resolve_expression")
+                        if is_expression_like:
+                            # Special-case Value() which can be unwrapped safely
+                            if isinstance(value, Value):
+                                try:
+                                    setattr(obj, field, value.value)
+                                except Exception:
+                                    # If Value cannot be unwrapped for any reason, skip assignment
+                                    continue
+                            else:
+                                # Do not assign unresolved expressions to in-memory objects
+                                logger.debug(
+                                    f"Skipping assignment of expression {type(value).__name__} to field {field}"
+                                )
                                 continue
                         else:
-                            # Do not assign unresolved expressions to in-memory objects
-                            continue
-                    else:
-                        setattr(obj, field, value)
+                            setattr(obj, field, value)
 
-        # Check if we're in a bulk operation context to prevent double hook execution
+        # Salesforce-style trigger behavior: Always run hooks, rely on Django's stack overflow protection
         from django_bulk_hooks.context import get_bypass_hooks
 
         current_bypass_hooks = get_bypass_hooks()
 
-        # If we're in a bulk operation context, skip hooks to prevent double execution
+        # Only skip hooks if explicitly bypassed (not for recursion prevention)
         if current_bypass_hooks:
-            logger.debug("update: skipping hooks (bulk context)")
+            logger.debug("update: hooks explicitly bypassed")
             ctx = HookContext(model_cls, bypass_hooks=True)
         else:
-            logger.debug("update: running hooks (standalone)")
+            # Always run hooks - Django will handle stack overflow protection
+            logger.debug("update: running hooks with Salesforce-style behavior")
             ctx = HookContext(model_cls, bypass_hooks=False)
+
             # Run validation hooks first
             engine.run(model_cls, VALIDATE_UPDATE, instances, originals, ctx=ctx)
             # Then run BEFORE_UPDATE hooks
@@ -385,19 +397,12 @@ class HookQuerySetMixin:
                                 getattr(refreshed_instance, field.name),
                             )
 
-        # Run AFTER_UPDATE hooks for standalone updates or subquery operations
-        # For subquery operations, we need to run hooks even if we're in a bulk context
-        # because subqueries bypass the normal object-level update flow
-        should_run_hooks = (
-            not current_bypass_hooks
-            or has_subquery  # Always run hooks for subquery operations
-        )
-
-        if should_run_hooks:
+        # Salesforce-style: Always run AFTER_UPDATE hooks unless explicitly bypassed
+        if not current_bypass_hooks:
             logger.debug("update: running AFTER_UPDATE")
             engine.run(model_cls, AFTER_UPDATE, instances, originals, ctx=ctx)
         else:
-            logger.debug("update: skipping AFTER_UPDATE (bulk context)")
+            logger.debug("update: AFTER_UPDATE explicitly bypassed")
 
         return update_count
 

{django_bulk_hooks-0.1.242 → django_bulk_hooks-0.1.244}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.1.242"
+version = "0.1.244"
 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"