django-bulk-hooks 0.2.51__tar.gz → 0.2.53__tar.gz

{django_bulk_hooks-0.2.51 → django_bulk_hooks-0.2.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.51
+Version: 0.2.53
 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.51 → django_bulk_hooks-0.2.53}/django_bulk_hooks/operations/bulk_executor.py

@@ -261,57 +261,46 @@ class BulkExecutor:
                         parent_instances_map[orig_obj_id] = {}
                     parent_instances_map[orig_obj_id][parent_level.model_class] = parent_obj
 
-            # Step 2: Add parent links to child objects and set PKs for existing records
+            # Step 2: Add parent links to child objects and set PKs appropriately
             for child_obj, orig_obj in zip(plan.child_objects, plan.original_objects):
                 parent_instances = parent_instances_map.get(id(orig_obj), {})
 
-                # Set parent links
+                # Set parent links and PKs for all objects (since in MTI, child PK = parent PK)
                 for parent_model, parent_instance in parent_instances.items():
                     parent_link = plan.child_model._meta.get_ancestor_link(parent_model)
                     if parent_link:
-                        setattr(child_obj, parent_link.attname, parent_instance.pk)
+                        parent_pk = parent_instance.pk
+                        setattr(child_obj, parent_link.attname, parent_pk)
                         setattr(child_obj, parent_link.name, parent_instance)
-                        # IMPORTANT: Don't set the child's PK here - it should only get PK after insertion
-                        # The parent link field (hookmodel_ptr) is NOT the same as the child's PK
+                        # In MTI, the child PK IS the parent link
+                        child_obj.pk = parent_pk
+                        child_obj.id = parent_pk
                     else:
                         logger.warning(f"No parent link found for {parent_model} in {plan.child_model}")
 
-                # For existing records in upsert, ensure PK is set on child object
-                if id(orig_obj) in plan.existing_record_ids:
-                    pk_value = getattr(orig_obj, "pk", None)
-                    if pk_value:
-                        child_obj.pk = pk_value
-                        child_obj.id = pk_value
-                    else:
-                        # If no PK on original object, this is a new record, don't set PK
-                        logger.info(f"New record {orig_obj} - not setting PK on child object")
-
             # Step 3: Handle child objects
             # Note: We can't use bulk_create on child MTI models, so we use _batched_insert for new records
             # and bulk_update for existing records
             base_qs = BaseQuerySet(model=plan.child_model, using=self.queryset.db)
-            
-            # For MTI child objects, we need to handle them differently
-            # In MTI, child objects get PKs from parent links, but we need to distinguish
-            # between truly new records and existing records for upsert operations
+
+            # For MTI child objects, we need to distinguish between truly new records and existing records for upsert operations
             objs_without_pk, objs_with_pk = [], []
-            
+
             # Check which CHILD records actually exist in the child table
-            # This is separate from checking parent existence
             if plan.update_conflicts:
-                # Query the CHILD table to see which child records exist
-                parent_pks = []
+                # For upsert, check which child records exist based on the parent PKs
+                parent_pks_to_check = []
                 for child_obj in plan.child_objects:
                     child_pk = getattr(child_obj, plan.child_model._meta.pk.attname, None)
                     if child_pk:
-                        parent_pks.append(child_pk)
-                
+                        parent_pks_to_check.append(child_pk)
+
                 existing_child_pks = set()
-                if parent_pks:
+                if parent_pks_to_check:
                     existing_child_pks = set(
-                        base_qs.filter(pk__in=parent_pks).values_list('pk', flat=True)
+                        base_qs.filter(pk__in=parent_pks_to_check).values_list('pk', flat=True)
                     )
-                
+
                 # Split based on whether child record exists
                 for child_obj in plan.child_objects:
                     child_pk = getattr(child_obj, plan.child_model._meta.pk.attname, None)

{django_bulk_hooks-0.2.51 → django_bulk_hooks-0.2.53}/django_bulk_hooks/operations/mti_handler.py

@@ -121,26 +121,29 @@ class MTIHandler:
         - If parent exists but child doesn't: creating child for existing parent → AFTER_UPDATE
         - If neither exists: creating both parent and child → AFTER_CREATE
 
-        Therefore, we return the root parent model to check if the parent record exists,
-        regardless of where the unique fields are defined.
+        Therefore, we find the model that contains all the unique fields, regardless
+        of whether it's the parent or child model.
 
         Args:
             unique_fields: List of field names forming the unique constraint
 
         Returns:
-            Model class to query for existing records (root parent for MTI)
+            Model class to query for existing records (model containing unique fields)
         """
         if not unique_fields:
             return self.model_cls
 
         inheritance_chain = self.get_inheritance_chain()
 
-        # For MTI models with multiple levels, return the root parent model
-        # This ensures we check if the parent exists, which determines create vs update hooks
+        # For MTI models, find the model in the chain that contains ALL unique fields
         if len(inheritance_chain) > 1:
-            return inheritance_chain[0]  # Root parent model
+            # Walk through inheritance chain from child to parent
+            for model in reversed(inheritance_chain):  # Start with child, end with root parent
+                model_field_names = {f.name for f in model._meta.local_fields}
+                if all(field in model_field_names for field in unique_fields):
+                    return model
 
-        # For non-MTI models (shouldn't happen, but safe fallback)
+        # For non-MTI models or as fallback
         return self.model_cls
 
     # ==================== MTI BULK CREATE PLANNING ====================
@@ -190,12 +193,8 @@ class MTIHandler:
         if existing_pks_map is None:
             existing_pks_map = {}
 
-        # Set PKs on existing objects so they can be updated
-        if existing_pks_map:
-            for obj in objs:
-                if id(obj) in existing_pks_map:
-                    obj.pk = existing_pks_map[id(obj)]
-                    obj.id = existing_pks_map[id(obj)]
+        # For upsert operations, don't set PKs on source objects - let Django's bulk_create handle it
+        # The PKs will be set on the resulting objects after the bulk operation
 
         # Build parent levels
         parent_levels = self._build_parent_levels(

{django_bulk_hooks-0.2.51 → django_bulk_hooks-0.2.53}/pyproject.toml

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