django-bulk-hooks 0.1.243__py3-none-any.whl → 0.1.245__py3-none-any.whl

django_bulk_hooks/queryset.py

@@ -158,26 +158,35 @@ class HookQuerySetMixin:
                         else:
                             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
-            engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
+
+            # For Subquery updates, we need to run hooks AFTER the database update and refresh
+            # For non-Subquery updates, we can run hooks before the database update as usual
+            if not has_subquery:
+                # Run validation hooks first
+                engine.run(model_cls, VALIDATE_UPDATE, instances, originals, ctx=ctx)
+                # Then run BEFORE_UPDATE hooks
+                engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
 
             # Persist any additional field mutations made by BEFORE_UPDATE hooks.
             # Build CASE statements per modified field not already present in kwargs.
-            modified_fields = self._detect_modified_fields(instances, originals)
+            modified_fields = (
+                self._detect_modified_fields(instances, originals)
+                if not has_subquery
+                else set()
+            )
             extra_fields = [f for f in modified_fields if f not in kwargs]
             if extra_fields:
                 case_statements = {}
@@ -375,7 +384,11 @@ class HookQuerySetMixin:
             raise
 
         # If we used Subquery objects, refresh the instances to get computed values
-        if has_subquery and instances:
+        # and then run hooks so HasChanged conditions work correctly
+        if has_subquery and instances and not current_bypass_hooks:
+            logger.debug(
+                "Refreshing instances with Subquery computed values before running hooks"
+            )
             # Simple refresh of model fields without fetching related objects
             # Subquery updates only affect the model's own fields, not relationships
             refreshed_instances = {
@@ -395,19 +408,19 @@ 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
-        )
+            # Now run the hooks with the refreshed instances containing computed values
+            logger.debug("Running hooks after Subquery refresh")
+            # Run validation hooks first
+            engine.run(model_cls, VALIDATE_UPDATE, instances, originals, ctx=ctx)
+            # Then run BEFORE_UPDATE hooks
+            engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
 
-        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.243.dist-info → django_bulk_hooks-0.1.245.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.243
+Version: 0.1.245
 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.243.dist-info → django_bulk_hooks-0.1.245.dist-info}/RECORD

@@ -9,9 +9,9 @@ django_bulk_hooks/handler.py,sha256=e_GACTQT-pFF-zL7POeo232MgOikUoCLcxDVInAUiBw,
 django_bulk_hooks/manager.py,sha256=nfWiwU5-yAoxdnQsUMohxtyCpkV0MBv6X3wmipr9eQY,3697
 django_bulk_hooks/models.py,sha256=WtSfc4GBOG_oOt8n37cVvid0MtFIGze9JYKSixil2y0,4370
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=73l5YZXea1vhQr2H3JagVwYPAtuw9FVzp3Qb2khEwIY,50215
+django_bulk_hooks/queryset.py,sha256=4fhRS44IZfhCyUdqqcTp7p9XUyGTLcNoViFNSPEP88I,50995
 django_bulk_hooks/registry.py,sha256=GRUTGVQEO2sdkC9OaZ9Q3U7mM-3Ix83uTyvrlTtpatw,1317
-django_bulk_hooks-0.1.243.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.243.dist-info/METADATA,sha256=29LtTjeGKvX-piAZAVOJqthlW_9IzTMTLI6L0GBh-4A,9049
-django_bulk_hooks-0.1.243.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_bulk_hooks-0.1.243.dist-info/RECORD,,
+django_bulk_hooks-0.1.245.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.245.dist-info/METADATA,sha256=HiXQqF3rkZYjfHL79nFgGmPOo8GKB2i6Fd39Jm_FYFI,9049
+django_bulk_hooks-0.1.245.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_bulk_hooks-0.1.245.dist-info/RECORD,,