django-bulk-hooks 0.2.55__tar.gz → 0.2.57__tar.gz

{django_bulk_hooks-0.2.55 → django_bulk_hooks-0.2.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.55
+Version: 0.2.57
 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.55 → django_bulk_hooks-0.2.57}/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.55 → django_bulk_hooks-0.2.57}/django_bulk_hooks/operations/mti_handler.py

@@ -207,6 +207,8 @@ class MTIHandler:
             update_conflicts=update_conflicts,
             unique_fields=unique_fields,
             update_fields=update_fields,
+            existing_record_ids=existing_record_ids,
+            existing_pks_map=existing_pks_map,
         )
 
         # Build child object templates (without parent links - executor adds them)
@@ -235,6 +237,8 @@ class MTIHandler:
         update_conflicts=False,
         unique_fields=None,
         update_fields=None,
+        existing_record_ids=None,
+        existing_pks_map=None,
     ):
         """
         Build parent level objects for each level in the inheritance chain.
@@ -249,6 +253,12 @@ 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()
+        if existing_pks_map is None:
+            existing_pks_map = {}
+
         for level_idx, model_class in enumerate(inheritance_chain[:-1]):
             parent_objs_for_level = []
 
@@ -301,6 +311,28 @@ class MTIHandler:
                         level_update_conflicts = True
                         level_unique_fields = normalized_unique
                         level_update_fields = filtered_updates
+                else:
+                    # CRITICAL FIX: Even if this parent level doesn't have the unique constraint,
+                    # we still need update_conflicts=True during MTI upsert. Without it, parent
+                    # does plain INSERT creating a new parent record with a new PK, breaking the
+                    # MTI relationship and causing child INSERT to fail on its unique constraint.
+                    #
+                    # Solution: Use the primary key as the unique field for parent levels.
+                    # In MTI upsert with existing_pks_map, parent objects will get their PKs from
+                    # bulk_create, and we need those PKs to match existing records, not create new ones.
+                    if existing_record_ids and existing_pks_map:
+                        # Use primary key for upsert matching at this level
+                        pk_field = model_class._meta.pk
+                        level_update_conflicts = True
+                        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
+                        ]
+                        level_update_fields = available_fields[:1] if available_fields else [pk_field.name]
 
             # Create parent level
             parent_level = ParentLevel(
@@ -367,7 +399,7 @@ class MTIHandler:
             # for this level, leading to IntegrityError on primary key constraint.
             if isinstance(field, AutoField):
                 continue
-                
+
             if hasattr(source_obj, field.name):
                 # Use centralized field value extraction for consistent FK handling
                 value = get_field_value_for_db(source_obj, field.name, source_obj.__class__)

{django_bulk_hooks-0.2.55 → django_bulk_hooks-0.2.57}/pyproject.toml

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