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

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

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

@@ -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:

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

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