django-bulk-hooks 0.1.224__py3-none-any.whl → 0.1.226__py3-none-any.whl

django_bulk_hooks/models.py

@@ -68,6 +68,7 @@ class HookModelMixin(models.Model):
             logger.debug(f"save() creating new {self.__class__.__name__} instance")
             # For create operations, we don't have old records
             ctx = HookContext(self.__class__)
+            run(self.__class__, VALIDATE_CREATE, [self], ctx=ctx)
             run(self.__class__, BEFORE_CREATE, [self], ctx=ctx)
 
             super().save(*args, **kwargs)
@@ -80,6 +81,7 @@ class HookModelMixin(models.Model):
                 # Use _base_manager to avoid triggering hooks recursively
                 old_instance = self.__class__._base_manager.get(pk=self.pk)
                 ctx = HookContext(self.__class__)
+                run(self.__class__, VALIDATE_UPDATE, [self], [old_instance], ctx=ctx)
                 run(self.__class__, BEFORE_UPDATE, [self], [old_instance], ctx=ctx)
 
                 super().save(*args, **kwargs)
@@ -88,6 +90,7 @@ class HookModelMixin(models.Model):
             except self.__class__.DoesNotExist:
                 # If the old instance doesn't exist, treat as create
                 ctx = HookContext(self.__class__)
+                run(self.__class__, VALIDATE_CREATE, [self], ctx=ctx)
                 run(self.__class__, BEFORE_CREATE, [self], ctx=ctx)
 
                 super().save(*args, **kwargs)

django_bulk_hooks/queryset.py

@@ -65,11 +65,27 @@ class HookQuerySetMixin:
         }
         originals = [original_map.get(obj.pk) for obj in instances]
 
-        # Check if any of the update values are Subquery objects
+        # Check if any of the update values are complex database expressions (Subquery, Case, etc.)
         has_subquery = any(
-            hasattr(value, "query") and hasattr(value, "resolve_expression")
+            (hasattr(value, "query") and hasattr(value, "resolve_expression"))
+            or hasattr(
+                value, "resolve_expression"
+            )  # This catches Case, F expressions, etc.
             for value in kwargs.values()
         )
+        
+        # Also check if any of the instances have complex expressions in their attributes
+        # This can happen when bulk_update creates Case expressions and applies them to instances
+        if not has_subquery and instances:
+            for instance in instances:
+                for field_name in kwargs.keys():
+                    if hasattr(instance, field_name):
+                        field_value = getattr(instance, field_name)
+                        if hasattr(field_value, "resolve_expression"):
+                            has_subquery = True
+                            break
+                if has_subquery:
+                    break
 
         # Check if we're in a bulk operation context to prevent double hook execution
         from django_bulk_hooks.context import get_bypass_hooks
@@ -98,19 +114,20 @@ class HookQuerySetMixin:
                     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
+                except (TypeError, ValueError, AttributeError) as e:
+                    # If validation fails due to Subquery/Case comparison, skip validation for complex updates
+                    # This is a limitation - validation hooks cannot easily work with unresolved database expressions
                     logger.warning(
-                        f"Skipping validation hooks for subquery update due to: {e}"
+                        f"Skipping validation hooks for complex update due to: {e}"
                     )
 
                 # 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
+                # Use the model's default manager to ensure queryable properties are properly handled
                 refreshed_instances = {
-                    obj.pk: obj for obj in model_cls._base_manager.filter(pk__in=pks)
+                    obj.pk: obj for obj in model_cls.objects.filter(pk__in=pks)
                 }
 
                 # Update instances in memory with computed values

{django_bulk_hooks-0.1.224.dist-info → django_bulk_hooks-0.1.226.dist-info}/METADATA

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

@@ -7,11 +7,11 @@ django_bulk_hooks/engine.py,sha256=t_kvgex6_iZEFc5LK-srBTZPe-1bdlYdip5LfWOc6lc,2
 django_bulk_hooks/enums.py,sha256=Zo8_tJzuzZ2IKfVc7gZ-0tWPT8q1QhqZbAyoh9ZVJbs,381
 django_bulk_hooks/handler.py,sha256=xZt8iNdYF-ACz-MnKMY0co6scWINU5V5wC1lyDn844k,4854
 django_bulk_hooks/manager.py,sha256=nfWiwU5-yAoxdnQsUMohxtyCpkV0MBv6X3wmipr9eQY,3697
-django_bulk_hooks/models.py,sha256=exnXYVKEVbYAXhChCP8VdWTnKCnm9DiTcokEIBee1I0,4350
+django_bulk_hooks/models.py,sha256=mj4f93L64CN1XBS29RlS02WnZjCNoUkai97vKqjgZQ8,4575
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=ZEYrO8AJunmoS9n7xSkjDTG3kOAntAOTnpfsd-GhC0c,33798
+django_bulk_hooks/queryset.py,sha256=1Tb-mXHNqzsrcDFU6YURooT1aHNpb56oFGF1ndBaXnw,34763
 django_bulk_hooks/registry.py,sha256=8UuhniiH5ChSeOKV1UUbqTEiIu25bZXvcHmkaRbxmME,1131
-django_bulk_hooks-0.1.224.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.224.dist-info/METADATA,sha256=Z2cm7smH6WA8oIybkRrlec4Z3ault2_3YwEY0DDp-LE,9049
-django_bulk_hooks-0.1.224.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_bulk_hooks-0.1.224.dist-info/RECORD,,
+django_bulk_hooks-0.1.226.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.226.dist-info/METADATA,sha256=9szvW2lyMJr2LMSqDQu32TtD8TKbUgPQ-GsaU-t0jnI,9049
+django_bulk_hooks-0.1.226.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_bulk_hooks-0.1.226.dist-info/RECORD,,