django-bulk-hooks 0.1.222__py3-none-any.whl → 0.1.223__py3-none-any.whl

django_bulk_hooks/queryset.py

@@ -76,54 +76,67 @@ class HookQuerySetMixin:
 
         current_bypass_hooks = get_bypass_hooks()
 
-        # If we used Subquery objects, we need to resolve them before hooks to avoid comparison errors
-        if has_subquery and not current_bypass_hooks:
-            # Execute the Django update first to compute subquery values
+        # Apply field updates to instances for all cases (needed for hook inspection)
+        for obj in instances:
+            for field, value in kwargs.items():
+                # For subquery fields, set the original Subquery object temporarily
+                # We'll resolve it after database update if needed
+                setattr(obj, field, value)
+
+        # If we're in a bulk operation context, skip hooks to prevent double execution
+        if current_bypass_hooks:
+            ctx = HookContext(model_cls, bypass_hooks=True)
+            # For bulk operations without hooks, execute update
             update_count = super().update(**kwargs)
+        else:
+            ctx = HookContext(model_cls, bypass_hooks=False)
 
-            # Refresh instances to get computed subquery values BEFORE running hooks
-            refreshed_instances = {
-                obj.pk: obj for obj in model_cls._base_manager.filter(pk__in=pks)
-            }
-
-            # Update instances in memory with computed values
-            for instance in instances:
-                if instance.pk in refreshed_instances:
-                    refreshed_instance = refreshed_instances[instance.pk]
-                    # Update all fields except primary key with the computed values
-                    for field in model_cls._meta.fields:
-                        if field.name != "id":
-                            setattr(
-                                instance,
-                                field.name,
-                                getattr(refreshed_instance, field.name),
-                            )
+            # For subquery cases, we need special handling
+            if has_subquery:
+                # Run validation hooks first with Subquery objects (if validation doesn't access them)
+                try:
+                    engine.run(
+                        model_cls, VALIDATE_UPDATE, instances, originals, ctx=ctx
+                    )
+                except (TypeError, ValueError) as e:
+                    # If validation fails due to Subquery comparison, skip validation for subquery updates
+                    # This is a limitation - validation hooks cannot easily work with unresolved subqueries
+                    logger.warning(
+                        f"Skipping validation hooks for subquery update due to: {e}"
+                    )
 
-            # Now run hooks with resolved subquery values
-            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)
-        else:
-            # Apply field updates to instances for non-subquery cases
-            for obj in instances:
-                for field, value in kwargs.items():
-                    setattr(obj, field, value)
-
-            # If we're in a bulk operation context, skip hooks to prevent double execution
-            if current_bypass_hooks:
-                ctx = HookContext(model_cls, bypass_hooks=True)
-                # For bulk operations without hooks, execute Django update if not done already
+                # Execute the database update first to compute subquery values
                 update_count = super().update(**kwargs)
+
+                # Refresh instances to get computed subquery values BEFORE running BEFORE hooks
+                refreshed_instances = {
+                    obj.pk: obj for obj in model_cls._base_manager.filter(pk__in=pks)
+                }
+
+                # Update instances in memory with computed values
+                for instance in instances:
+                    if instance.pk in refreshed_instances:
+                        refreshed_instance = refreshed_instances[instance.pk]
+                        # Update all fields except primary key with the computed values
+                        for field in model_cls._meta.fields:
+                            if field.name != "id":
+                                setattr(
+                                    instance,
+                                    field.name,
+                                    getattr(refreshed_instance, field.name),
+                                )
+
+                # Now run BEFORE_UPDATE hooks with resolved values
+                # Note: This is a trade-off - BEFORE hooks run after DB update for subquery cases
+                engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
             else:
-                ctx = HookContext(model_cls, bypass_hooks=False)
+                # Normal case without subqueries - run hooks in proper order
                 # 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)
 
-                # Execute Django update if not done already (for non-subquery cases)
+                # Execute update
                 update_count = super().update(**kwargs)
 
         # Run AFTER_UPDATE hooks only for standalone updates

{django_bulk_hooks-0.1.222.dist-info → django_bulk_hooks-0.1.223.dist-info}/METADATA

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

@@ -9,9 +9,9 @@ django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,
 django_bulk_hooks/manager.py,sha256=nfWiwU5-yAoxdnQsUMohxtyCpkV0MBv6X3wmipr9eQY,3697
 django_bulk_hooks/models.py,sha256=exnXYVKEVbYAXhChCP8VdWTnKCnm9DiTcokEIBee1I0,4350
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=INcmUxugAxDY8M2Swvv4lItyniejT1CNUpJtEnFfoBw,33087
+django_bulk_hooks/queryset.py,sha256=ZEYrO8AJunmoS9n7xSkjDTG3kOAntAOTnpfsd-GhC0c,33798
 django_bulk_hooks/registry.py,sha256=8UuhniiH5ChSeOKV1UUbqTEiIu25bZXvcHmkaRbxmME,1131
-django_bulk_hooks-0.1.222.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.222.dist-info/METADATA,sha256=QJazHusCLVY-qjWHDauyE9KUPPsnvGOLTd6ral0T9Wc,9049
-django_bulk_hooks-0.1.222.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_bulk_hooks-0.1.222.dist-info/RECORD,,
+django_bulk_hooks-0.1.223.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.223.dist-info/METADATA,sha256=IW85vPi4EzF2Z3NrWrlZri4Ps65WGsITEvhbfcbZdWw,9049
+django_bulk_hooks-0.1.223.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_bulk_hooks-0.1.223.dist-info/RECORD,,