django-bulk-hooks 0.2.46__tar.gz → 0.2.48__tar.gz

{django_bulk_hooks-0.2.46 → django_bulk_hooks-0.2.48}/PKG-INFO

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

@@ -80,7 +80,14 @@ class BulkExecutor:
                 existing_record_ids = set()
                 existing_pks_map = {}
                 if update_conflicts and unique_fields:
-                    existing_record_ids, existing_pks_map = self.record_classifier.classify_for_upsert(objs, unique_fields)
+                    # For MTI, find which model has the unique fields and query THAT model
+                    # This handles the schema migration case where parent exists but child doesn't
+                    query_model = self.mti_handler.find_model_with_unique_fields(unique_fields)
+                    logger.info(f"MTI upsert: querying {query_model.__name__} for unique fields {unique_fields}")
+                    
+                    existing_record_ids, existing_pks_map = self.record_classifier.classify_for_upsert(
+                        objs, unique_fields, query_model=query_model
+                    )
                     logger.info(f"MTI Upsert classification: {len(existing_record_ids)} existing, {len(objs) - len(existing_record_ids)} new")
                     logger.info(f"existing_record_ids: {existing_record_ids}")
                     logger.info(f"existing_pks_map: {existing_pks_map}")
@@ -100,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
 
@@ -119,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
 
@@ -500,7 +507,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.
 
@@ -510,13 +517,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
 
@@ -527,6 +539,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.46 → django_bulk_hooks-0.2.48}/django_bulk_hooks/operations/coordinator.py

@@ -136,7 +136,15 @@ class BulkOperationCoordinator:
         existing_record_ids = set()
         existing_pks_map = {}
         if update_conflicts and unique_fields:
-            existing_record_ids, existing_pks_map = self.record_classifier.classify_for_upsert(objs, unique_fields)
+            # For MTI models, query the parent model that has the unique fields
+            query_model = None
+            if self.mti_handler.is_mti_model():
+                query_model = self.mti_handler.find_model_with_unique_fields(unique_fields)
+                logger.info(f"MTI model detected: querying {query_model.__name__} for unique fields {unique_fields}")
+            
+            existing_record_ids, existing_pks_map = self.record_classifier.classify_for_upsert(
+                objs, unique_fields, query_model=query_model
+            )
             logger.info(f"Upsert operation: {len(existing_record_ids)} existing, {len(objs) - len(existing_record_ids)} new records")
             logger.debug(f"Existing record IDs: {existing_record_ids}")
             logger.debug(f"Existing PKs map: {existing_pks_map}")

{django_bulk_hooks-0.2.46 → django_bulk_hooks-0.2.48}/django_bulk_hooks/operations/mti_handler.py

@@ -111,6 +111,35 @@ class MTIHandler:
         """
         return list(model_cls._meta.local_fields)
 
+    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.
+        
+        Args:
+            unique_fields: List of field names forming the unique constraint
+        
+        Returns:
+            Model class that contains all the unique fields (closest to root)
+        """
+        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)
+        return self.model_cls
+
     # ==================== MTI BULK CREATE PLANNING ====================
 
     def build_create_plan(

{django_bulk_hooks-0.2.46 → django_bulk_hooks-0.2.48}/django_bulk_hooks/operations/record_classifier.py

@@ -31,7 +31,7 @@ class RecordClassifier:
         """
         self.model_cls = model_cls
 
-    def classify_for_upsert(self, objs, unique_fields):
+    def classify_for_upsert(self, objs, unique_fields, query_model=None):
         """
         Classify records as new or existing based on unique_fields.
 
@@ -41,6 +41,7 @@ class RecordClassifier:
         Args:
             objs: List of model instances
             unique_fields: List of field names that form the unique constraint
+            query_model: Optional model class to query (for MTI, may be different from self.model_cls)
 
         Returns:
             Tuple of (existing_record_ids, existing_pks_map)
@@ -50,6 +51,9 @@ class RecordClassifier:
         if not unique_fields or not objs:
             return set(), {}
 
+        # Use query_model if provided (for MTI scenarios), otherwise use self.model_cls
+        query_model = query_model or self.model_cls
+
         # Build a query to find existing records
         queries = []
         obj_to_unique_values = {}
@@ -77,10 +81,10 @@ class RecordClassifier:
         for q in queries[1:]:
             combined_query |= q
 
-        logger.info(f"Classifying for upsert: model={self.model_cls.__name__}, query={combined_query}, unique_fields={unique_fields}")
-        queryset = self.model_cls.objects.filter(combined_query)
+        logger.info(f"Classifying for upsert: model={query_model.__name__}, query={combined_query}, unique_fields={unique_fields}")
+        queryset = query_model.objects.filter(combined_query)
         logger.info(f"Queryset SQL: {queryset.query}")
-        logger.info(f"All records in table: {self.model_cls.objects.all().count()}")
+        logger.info(f"All records in table: {query_model.objects.all().count()}")
         existing_records = list(queryset.values("pk", *unique_fields))
         logger.info(f"Found {len(existing_records)} existing records: {existing_records}")
 

{django_bulk_hooks-0.2.46 → django_bulk_hooks-0.2.48}/pyproject.toml

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