django-bulk-hooks 0.2.56__tar.gz → 0.2.58__tar.gz

{django_bulk_hooks-0.2.56 → django_bulk_hooks-0.2.58}/PKG-INFO

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

{django_bulk_hooks-0.2.56 → django_bulk_hooks-0.2.58}/django_bulk_hooks/operations/bulk_executor.py

@@ -8,6 +8,7 @@ import logging
 
 from django.db import transaction
 from django.db.models import AutoField, ForeignKey, Case, When, Value
+from django.db.models.constants import OnConflict
 from django.db.models.functions import Cast
 
 from django_bulk_hooks.operations.field_utils import get_field_value_for_db
@@ -333,15 +334,64 @@ class BulkExecutor:
             if objs_without_pk:
                 base_qs._prepare_for_bulk_create(objs_without_pk)
                 opts = plan.child_model._meta
-                
+
                 # Include all local fields except auto-generated ones
                 # For MTI, we need to include the parent link (which is the PK)
                 filtered_fields = [f for f in opts.local_fields if not f.generated]
-                
+
+                # FIX: Pass conflict resolution parameters to _batched_insert for MTI child tables
+                # Previously, _batched_insert was called without on_conflict/unique_fields/update_fields,
+                # causing IntegrityError when child tables have unique constraints during upsert operations.
+                # See: https://github.com/user/repo/issues/XXX
+                # Prepare conflict resolution parameters for upsert
+                on_conflict = None
+                batched_unique_fields = None
+                batched_update_fields = None
+
+                if plan.update_conflicts:
+                    # Filter unique_fields and update_fields to only those on child model
+                    # Django's _batched_insert expects field objects, not field names
+                    child_model_fields_dict = {field.name: field for field in plan.child_model._meta.local_fields}
+
+                    # Unique fields may be on parent or child - filter to child only for child table insert
+                    # Convert field names to field objects
+                    if plan.unique_fields:
+                        batched_unique_fields = [
+                            child_model_fields_dict[fname]
+                            for fname in plan.unique_fields
+                            if fname in child_model_fields_dict
+                        ]
+
+                    # Update fields - filter to child only
+                    # Keep as strings - Django's _batched_insert accepts field name strings for update_fields
+                    if plan.update_fields:
+                        batched_update_fields = [
+                            fname
+                            for fname in plan.update_fields
+                            if fname in child_model_fields_dict
+                        ]
+
+                    # Only set on_conflict if we have unique fields for this table
+                    # Note: If unique_fields are all on parent, batched_unique_fields will be empty,
+                    # meaning no conflict resolution needed for child table
+                    if batched_unique_fields:
+                        if batched_update_fields:
+                            # We have both unique fields and update fields on child - use UPDATE
+                            on_conflict = OnConflict.UPDATE
+                        else:
+                            # We have unique fields on child but no update fields - use IGNORE
+                            # This handles the case where all update fields are on parent tables
+                            on_conflict = OnConflict.IGNORE
+                            # Clear batched_update_fields to avoid issues
+                            batched_update_fields = None
+
                 returned_columns = base_qs._batched_insert(
                     objs_without_pk,
                     filtered_fields,
                     batch_size=len(objs_without_pk),
+                    on_conflict=on_conflict,
+                    update_fields=batched_update_fields,
+                    unique_fields=batched_unique_fields,
                 )
                 if returned_columns:
                     for obj, results in zip(objs_without_pk, returned_columns):

{django_bulk_hooks-0.2.56 → django_bulk_hooks-0.2.58}/django_bulk_hooks/operations/mti_handler.py

@@ -252,7 +252,7 @@ class MTIHandler:
 
         parent_levels = []
         parent_instances_map = {}  # Maps obj id() -> {model_class: parent_instance}
-        
+
         # Set defaults
         if existing_record_ids is None:
             existing_record_ids = set()
@@ -306,6 +306,14 @@ class MTIHandler:
                     if not filtered_updates and normalized_unique:
                         filtered_updates = [normalized_unique[0]]
 
+                    # CRITICAL FIX: Always include auto_now fields in updates to ensure timestamps are updated.
+                    # During MTI upsert, parent tables need auto_now fields updated even when only child fields change.
+                    # This ensures parent-level timestamps (e.g., updated_at) refresh correctly on upsert.
+                    auto_now_fields = self._get_auto_now_fields_for_model(model_class, model_fields_by_name)
+                    if auto_now_fields:
+                        # Convert to set to avoid duplicates, then back to list for consistency
+                        filtered_updates = list(set(filtered_updates) | set(auto_now_fields))
+
                     # Only enable upsert if we have fields to update (real or dummy)
                     if filtered_updates:
                         level_update_conflicts = True
@@ -327,10 +335,21 @@ class MTIHandler:
                         level_unique_fields = [pk_field.name]
                         # Use a safe update field - pick the first available non-PK field
                         # or use the PK itself as a dummy (updating to itself is a no-op)
-                        available_fields = [f.name for f in model_class._meta.local_fields 
-                                          if not isinstance(f, AutoField) and f.name in model_fields_by_name]
+                        available_fields = [
+                            f.name
+                            for f in model_class._meta.local_fields
+                            if not isinstance(f, AutoField) and f.name in model_fields_by_name
+                        ]
                         level_update_fields = available_fields[:1] if available_fields else [pk_field.name]
 
+                        # CRITICAL FIX: Include auto_now fields in update_fields to ensure timestamps are updated.
+                        # During MTI upsert, parent tables need auto_now fields updated even when using dummy fields.
+                        # This ensures parent-level timestamps (e.g., updated_at) refresh correctly on upsert.
+                        auto_now_fields = self._get_auto_now_fields_for_model(model_class, model_fields_by_name)
+                        if auto_now_fields:
+                            # Convert to set to avoid duplicates, then back to list for consistency
+                            level_update_fields = list(set(level_update_fields) | set(auto_now_fields))
+
             # Create parent level
             parent_level = ParentLevel(
                 model_class=model_class,
@@ -344,6 +363,29 @@ class MTIHandler:
 
         return parent_levels
 
+    def _get_auto_now_fields_for_model(self, model_class, model_fields_by_name):
+        """
+        Get auto_now (not auto_now_add) fields for a specific model.
+        
+        Only includes fields that exist in model_fields_by_name to ensure
+        they're valid local fields for this model level.
+        
+        Args:
+            model_class: Model class to get fields for
+            model_fields_by_name: Dict of valid field names for this model level
+            
+        Returns:
+            List of auto_now field names (excluding auto_now_add)
+        """
+        auto_now_fields = []
+        for field in model_class._meta.local_fields:
+            # Only include auto_now (not auto_now_add) since auto_now_add should only be set on creation
+            if getattr(field, "auto_now", False) and not getattr(field, "auto_now_add", False):
+                # Double-check field exists in model_fields_by_name for safety
+                if field.name in model_fields_by_name:
+                    auto_now_fields.append(field.name)
+        return auto_now_fields
+
     def _has_matching_constraint(self, model_class, normalized_unique):
         """Check if model has a unique constraint matching the given fields."""
         try:

{django_bulk_hooks-0.2.56 → django_bulk_hooks-0.2.58}/pyproject.toml

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