django-bulk-hooks 0.2.47__tar.gz → 0.2.50__tar.gz

{django_bulk_hooks-0.2.47 → django_bulk_hooks-0.2.50}/PKG-INFO

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

@@ -107,7 +107,7 @@ class BulkExecutor:
 
             # Tag objects with upsert metadata for hook dispatching
             if update_conflicts and unique_fields:
-                self._tag_upsert_metadata(result, existing_record_ids)
+                self._tag_upsert_metadata(result, existing_record_ids, existing_pks_map)
 
             return result
 
@@ -126,8 +126,8 @@ class BulkExecutor:
         if update_conflicts and unique_fields:
             # Use pre-classified results if available, otherwise classify now
             if existing_record_ids is None:
-                existing_record_ids, _ = self.record_classifier.classify_for_upsert(objs, unique_fields)
-            self._tag_upsert_metadata(result, existing_record_ids)
+                existing_record_ids, existing_pks_map = self.record_classifier.classify_for_upsert(objs, unique_fields)
+            self._tag_upsert_metadata(result, existing_record_ids, existing_pks_map)
 
         return result
 
@@ -243,9 +243,11 @@ class BulkExecutor:
                 # Copy generated fields back to parent objects
                 for upserted_parent, parent_obj in zip(upserted_parents, parent_level.objects):
                     for field in parent_level.model_class._meta.local_fields:
-                        upserted_value = getattr(upserted_parent, field.name, None)
+                        # Use attname for ForeignKey fields to avoid triggering database queries
+                        field_attr = field.attname if isinstance(field, ForeignKey) else field.name
+                        upserted_value = getattr(upserted_parent, field_attr, None)
                         if upserted_value is not None:
-                            setattr(parent_obj, field.name, upserted_value)
+                            setattr(parent_obj, field_attr, upserted_value)
 
                     parent_obj._state.adding = False
                     parent_obj._state.db = self.queryset.db
@@ -291,14 +293,36 @@ class BulkExecutor:
             # In MTI, child objects get PKs from parent links, but we need to distinguish
             # between truly new records and existing records for upsert operations
             objs_without_pk, objs_with_pk = [], []
-            for child_obj, orig_obj in zip(plan.child_objects, plan.original_objects):
-                # Check if this is an existing record (for upsert operations)
-                if id(orig_obj) in plan.existing_record_ids:
-                    # Existing record - should be updated
-                    objs_with_pk.append(child_obj)
-                else:
-                    # New record - should be inserted
-                    objs_without_pk.append(child_obj)
+            
+            # 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 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)
+                
+                existing_child_pks = set()
+                if parent_pks:
+                    existing_child_pks = set(
+                        base_qs.filter(pk__in=parent_pks).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)
+                    if child_pk and child_pk in existing_child_pks:
+                        # Child record exists - update it
+                        objs_with_pk.append(child_obj)
+                    else:
+                        # Child record doesn't exist - insert it
+                        objs_without_pk.append(child_obj)
+            else:
+                # Not an upsert - all are new records
+                objs_without_pk = plan.child_objects
+                objs_with_pk = []
 
             # For objects with PK (existing records in upsert), use bulk_update
             if objs_with_pk and plan.update_fields:
@@ -507,7 +531,7 @@ class BulkExecutor:
 
         return QuerySet.delete(self.queryset)
 
-    def _tag_upsert_metadata(self, result_objects, existing_record_ids):
+    def _tag_upsert_metadata(self, result_objects, existing_record_ids, existing_pks_map):
         """
         Tag objects with metadata indicating whether they were created or updated.
 
@@ -517,13 +541,18 @@ class BulkExecutor:
         Args:
             result_objects: List of objects returned from bulk operation
             existing_record_ids: Set of id() for objects that existed before the operation
+            existing_pks_map: Dict mapping id(obj) -> pk for existing records
         """
         created_count = 0
         updated_count = 0
 
+        # Create a set of PKs that existed before the operation
+        existing_pks = set(existing_pks_map.values())
+
         for obj in result_objects:
-            # Tag with metadata for hook dispatching
-            was_created = id(obj) not in existing_record_ids
+            # Use PK to determine if this record was created or updated
+            # If the PK was in the existing_pks_map, it was updated; otherwise created
+            was_created = obj.pk not in existing_pks
             obj._bulk_hooks_was_created = was_created
             obj._bulk_hooks_upsert_metadata = True
 
@@ -534,6 +563,6 @@ class BulkExecutor:
 
         logger.info(
             f"Tagged upsert metadata: {created_count} created, {updated_count} updated "
-            f"(total={len(result_objects)}, existing_ids={len(existing_record_ids)})"
+            f"(total={len(result_objects)}, existing_pks={len(existing_pks)})"
         )
 

{django_bulk_hooks-0.2.47 → django_bulk_hooks-0.2.50}/django_bulk_hooks/operations/mti_handler.py

@@ -78,8 +78,7 @@ class MTIHandler:
                 chain.append(current_model)
 
             # Get concrete parent models (not abstract, not proxy)
-            parents = [parent for parent in current_model._meta.parents.keys() 
-                      if not parent._meta.proxy and not parent._meta.abstract]
+            parents = [parent for parent in current_model._meta.parents.keys() if not parent._meta.proxy and not parent._meta.abstract]
 
             current_model = parents[0] if parents else None
 
@@ -113,31 +112,33 @@ class MTIHandler:
 
     def find_model_with_unique_fields(self, unique_fields):
         """
-        Find which model in the inheritance chain contains the unique fields.
-        
-        This is critical for MTI upserts: we need to query the model that has
-        the unique constraint, not necessarily the child model.
-        
+        Find which model in the inheritance chain to query for existing records.
+
+        For MTI upsert operations, we need to determine if the parent record exists
+        to properly fire AFTER_CREATE vs AFTER_UPDATE hooks. This is critical because:
+        - 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.
+
         Args:
             unique_fields: List of field names forming the unique constraint
-        
+
         Returns:
-            Model class that contains all the unique fields (closest to root)
+            Model class to query for existing records (root parent for MTI)
         """
         if not unique_fields:
             return self.model_cls
-        
+
         inheritance_chain = self.get_inheritance_chain()
-        
-        # Start from root and find the first model that has all unique fields
-        for model_cls in inheritance_chain:
-            model_field_names = {f.name for f in model_cls._meta.local_fields}
-            
-            # Check if this model has all the unique fields
-            if all(field in model_field_names for field in unique_fields):
-                return model_cls
-        
-        # Fallback to child model (shouldn't happen if unique_fields are valid)
+
+        # 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
+        if len(inheritance_chain) > 1:
+            return inheritance_chain[0]  # Root parent model
+
+        # For non-MTI models (shouldn't happen, but safe fallback)
         return self.model_cls
 
     # ==================== MTI BULK CREATE PLANNING ====================

{django_bulk_hooks-0.2.47 → django_bulk_hooks-0.2.50}/pyproject.toml

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