django-bulk-hooks 0.1.123__tar.gz → 0.1.125__tar.gz

{django_bulk_hooks-0.1.123 → django_bulk_hooks-0.1.125}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.123
+Version: 0.1.125
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 License: MIT
 Keywords: django,bulk,hooks

{django_bulk_hooks-0.1.123 → django_bulk_hooks-0.1.125}/django_bulk_hooks/queryset.py

@@ -1,10 +1,6 @@
-from django.db import models, transaction, connections
-from django.db.models import AutoField, Q, Max
-from django.db import NotSupportedError
-from django.db.models.constants import OnConflict
-from django.db.models.expressions import DatabaseDefault
-import operator
-from functools import reduce
+
+from django.db import models, transaction
+from django.db.models import AutoField
 
 from django_bulk_hooks import engine
 from django_bulk_hooks.constants import (
@@ -302,9 +298,13 @@ class HookQuerySet(models.QuerySet):
     def _process_mti_batch(self, batch, inheritance_chain, **kwargs):
         """
         Process a single batch of objects through the inheritance chain.
+        Reuses Django's internal functions as much as possible.
         """
-        # Step 1: Handle parent tables with individual saves (needed for PKs)
+        # For MTI, we need to save parent objects first to get PKs
+        # Then we can use Django's bulk_create for the child objects
         parent_objects_map = {}
+        
+        # Step 1: Save parent objects (we need their PKs for child objects)
         for obj in batch:
             parent_instances = {}
             current_parent = None
@@ -312,11 +312,13 @@ class HookQuerySet(models.QuerySet):
                 parent_obj = self._create_parent_instance(
                     obj, model_class, current_parent
                 )
-                parent_obj.save()
+                # Use Django's internal save method to avoid hooks
+                models.Model.save(parent_obj)
                 parent_instances[model_class] = parent_obj
                 current_parent = parent_obj
             parent_objects_map[id(obj)] = parent_instances
-        # Step 2: Bulk insert for child objects
+        
+        # Step 2: Create and bulk insert child objects
         child_model = inheritance_chain[-1]
         child_objects = []
         for obj in batch:
@@ -324,43 +326,19 @@ class HookQuerySet(models.QuerySet):
                 obj, child_model, parent_objects_map.get(id(obj), {})
             )
             child_objects.append(child_obj)
-        # If the child model is still MTI, call our own logic recursively
-        if len([p for p in child_model._meta.parents.keys() if not p._meta.proxy]) > 0:
-            # Build inheritance chain for the child model
-            child_inheritance_chain = []
-            current_model = child_model
-            while current_model:
-                if not current_model._meta.proxy:
-                    child_inheritance_chain.append(current_model)
-                parents = [
-                    parent
-                    for parent in current_model._meta.parents.keys()
-                    if not parent._meta.proxy
-                ]
-                current_model = parents[0] if parents else None
-            child_inheritance_chain.reverse()
-            
-            # For nested MTI, we can't use bulk operations recursively
-            # because it would create infinite recursion. Instead, we save each child individually.
-            # We use super().save() to avoid triggering hooks that would cause recursion.
-            created = []
-            for child_obj in child_objects:
-                # Use the base model's save method to avoid triggering hooks
-                # This prevents infinite recursion when hooks try to query the database
-                super(child_obj.__class__, child_obj).save()
-                created.append(child_obj)
-        else:
-            # Single-table, safe to use bulk_create
-            
-            child_manager = child_model._base_manager
-            child_manager._for_write = True
-            created = child_manager.bulk_create(child_objects, **kwargs)
+        
+        # Use Django's bulk_create for child objects - this handles auto_now_add correctly
+        child_manager = child_model._base_manager
+        child_manager._for_write = True
+        created = child_manager.bulk_create(child_objects, **kwargs)
+        
         # Step 3: Update original objects with generated PKs and state
         pk_field_name = child_model._meta.pk.name
         for orig_obj, child_obj in zip(batch, created):
             setattr(orig_obj, pk_field_name, getattr(child_obj, pk_field_name))
             orig_obj._state.adding = False
             orig_obj._state.db = self.db
+        
         return batch
 
     def _create_parent_instance(self, source_obj, parent_model, current_parent):
@@ -388,6 +366,12 @@ class HookQuerySet(models.QuerySet):
             elif hasattr(field, 'auto_now') and field.auto_now:
                 field.pre_save(parent_obj, add=True)
         
+        # Ensure auto_now_add fields are explicitly set to prevent null constraint violations
+        for field in parent_model._meta.local_fields:
+            if hasattr(field, 'auto_now_add') and field.auto_now_add:
+                if getattr(parent_obj, field.name) is None:
+                    field.pre_save(parent_obj, add=True)
+        
         return parent_obj
 
     def _create_child_instance(self, source_obj, child_model, parent_instances):
@@ -411,4 +395,11 @@ class HookQuerySet(models.QuerySet):
             elif hasattr(field, 'auto_now') and field.auto_now:
                 field.pre_save(child_obj, add=True)
         
+        # Ensure auto_now_add fields are explicitly set to prevent null constraint violations
+        for field in child_model._meta.local_fields:
+            if hasattr(field, 'auto_now_add') and field.auto_now_add:
+                if getattr(child_obj, field.name) is None:
+                    field.pre_save(child_obj, add=True)
+        
         return child_obj
+

{django_bulk_hooks-0.1.123 → django_bulk_hooks-0.1.125}/pyproject.toml

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