django-bulk-hooks 0.1.133__tar.gz → 0.1.135__tar.gz

{django_bulk_hooks-0.1.133 → django_bulk_hooks-0.1.135}/PKG-INFO

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

{django_bulk_hooks-0.1.133 → django_bulk_hooks-0.1.135}/django_bulk_hooks/queryset.py

@@ -371,48 +371,57 @@ class HookQuerySet(models.QuerySet):
             all_child_objects.append(child_obj)
         print(f"DEBUG: Created {len(all_child_objects)} child objects")
 
-        # Step 2.5: Use Django's internal _batched_insert method directly
+        # Step 2.5: Use Django's internal bulk_create infrastructure
         if all_child_objects:
-            print(f"DEBUG: Using Django's internal _batched_insert for {len(all_child_objects)} child objects")
+            print(f"DEBUG: Using Django's internal bulk_create infrastructure for {len(all_child_objects)} child objects")
             
             # Get the base manager's queryset
             base_qs = child_model._base_manager.using(self.db)
             
-            # Use Django's internal _batched_insert method directly
-            # This bypasses the MTI check but uses Django's optimized bulk insert
+            # Use Django's exact approach: call _prepare_for_bulk_create then partition
+            base_qs._prepare_for_bulk_create(all_child_objects)
+            
+            # Use partition like Django does to separate objects with PKs from those without
+            from itertools import partition
+            objs_without_pk, objs_with_pk = partition(lambda o: o._is_pk_set(), all_child_objects)
+            objs_without_pk = list(objs_without_pk)
+            objs_with_pk = list(objs_with_pk)
+            
+            print(f"DEBUG: Prepared {len(objs_with_pk)} objects with PK, {len(objs_without_pk)} objects without PK")
+            
+            # Use Django's internal _batched_insert method
             opts = child_model._meta
             fields = [f for f in opts.concrete_fields if not f.generated]
             
-            # Prepare objects for bulk insert (same logic as Django's bulk_create)
-            objs_with_pk, objs_without_pk = base_qs._prepare_for_bulk_create(all_child_objects)
-            
             with transaction.atomic(using=self.db, savepoint=False):
-                if objs_with_pk:
-                    returned_columns = base_qs._batched_insert(
-                        objs_with_pk,
-                        fields,
-                        batch_size=None,
-                    )
-                    for obj_with_pk, results in zip(objs_with_pk, returned_columns):
-                        for result, field in zip(results, opts.db_returning_fields):
-                            if field != opts.pk:
-                                setattr(obj_with_pk, field.attname, result)
-                    for obj_with_pk in objs_with_pk:
-                        obj_with_pk._state.adding = False
-                        obj_with_pk._state.db = self.db
-                
-                if objs_without_pk:
-                    fields = [f for f in fields if not isinstance(f, AutoField)]
-                    returned_columns = base_qs._batched_insert(
-                        objs_without_pk,
-                        fields,
-                        batch_size=None,
-                    )
-                    for obj_without_pk, results in zip(objs_without_pk, returned_columns):
-                        for result, field in zip(results, opts.db_returning_fields):
-                            setattr(obj_without_pk, field.attname, result)
-                        obj_without_pk._state.adding = False
-                        obj_without_pk._state.db = self.db
+                 if objs_with_pk:
+                     print(f"DEBUG: Inserting {len(objs_with_pk)} objects with PK")
+                     returned_columns = base_qs._batched_insert(
+                         objs_with_pk,
+                         fields,
+                         batch_size=len(objs_with_pk),  # Use actual batch size
+                     )
+                     for obj_with_pk, results in zip(objs_with_pk, returned_columns):
+                         for result, field in zip(results, opts.db_returning_fields):
+                             if field != opts.pk:
+                                 setattr(obj_with_pk, field.attname, result)
+                     for obj_with_pk in objs_with_pk:
+                         obj_with_pk._state.adding = False
+                         obj_with_pk._state.db = self.db
+                 
+                 if objs_without_pk:
+                     print(f"DEBUG: Inserting {len(objs_without_pk)} objects without PK")
+                     fields = [f for f in fields if not isinstance(f, AutoField)]
+                     returned_columns = base_qs._batched_insert(
+                         objs_without_pk,
+                         fields,
+                         batch_size=len(objs_without_pk),  # Use actual batch size
+                     )
+                     for obj_without_pk, results in zip(objs_without_pk, returned_columns):
+                         for result, field in zip(results, opts.db_returning_fields):
+                             setattr(obj_without_pk, field.attname, result)
+                         obj_without_pk._state.adding = False
+                         obj_without_pk._state.db = self.db
             
             print(f"DEBUG: Successfully bulk created child objects using Django's internal methods")
 

{django_bulk_hooks-0.1.133 → django_bulk_hooks-0.1.135}/pyproject.toml

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