django-bulk-hooks 0.2.57__py3-none-any.whl → 0.2.59__py3-none-any.whl

django_bulk_hooks/operations/coordinator.py

@@ -740,6 +740,8 @@ class BulkOperationCoordinator:
         if not result_objects:
             return
 
+        # First pass: collect objects with metadata and objects needing timestamp check
+        objects_needing_timestamp_check = []
         for obj in result_objects:
             # Check if metadata was set
             if hasattr(obj, "_bulk_hooks_was_created"):
@@ -749,29 +751,52 @@ class BulkOperationCoordinator:
                 else:
                     updated_objects.append(obj)
             else:
-                # Fallback: if no metadata, check timestamps
+                # Need to check timestamps - collect for bulk query
+                objects_needing_timestamp_check.append(obj)
+
+        # Bulk fetch timestamps for objects without metadata (avoids N+1 queries)
+        if objects_needing_timestamp_check:
+            # Group by model class to handle MTI scenarios
+            objects_by_model = {}
+            for obj in objects_needing_timestamp_check:
                 model_cls = obj.__class__
+                if model_cls not in objects_by_model:
+                    objects_by_model[model_cls] = []
+                objects_by_model[model_cls].append(obj)
+
+            # Fetch timestamps in bulk for each model class
+            for model_cls, objs in objects_by_model.items():
                 if hasattr(model_cls, "created_at") and hasattr(model_cls, "updated_at"):
-                    # Reload from DB to get accurate timestamps
-                    db_obj = model_cls.objects.filter(pk=obj.pk).values("created_at", "updated_at").first()
-                    if db_obj:
-                        created_at = db_obj["created_at"]
-                        updated_at = db_obj["updated_at"]
-                        if created_at and updated_at:
-                            time_diff = abs((updated_at - created_at).total_seconds())
-                            if time_diff <= 1.0:  # Within 1 second = just created
-                                created_objects.append(obj)
+                    # Bulk fetch timestamps for all objects of this model
+                    pks = [obj.pk for obj in objs if obj.pk is not None]
+                    if pks:
+                        timestamp_map = {
+                            record["pk"]: (record["created_at"], record["updated_at"])
+                            for record in model_cls.objects.filter(pk__in=pks).values("pk", "created_at", "updated_at")
+                        }
+
+                        # Classify each object based on timestamps
+                        for obj in objs:
+                            if obj.pk in timestamp_map:
+                                created_at, updated_at = timestamp_map[obj.pk]
+                                if created_at and updated_at:
+                                    time_diff = abs((updated_at - created_at).total_seconds())
+                                    if time_diff <= 1.0:  # Within 1 second = just created
+                                        created_objects.append(obj)
+                                    else:
+                                        updated_objects.append(obj)
+                                else:
+                                    # No timestamps, default to created
+                                    created_objects.append(obj)
                             else:
-                                updated_objects.append(obj)
-                        else:
-                            # No timestamps, default to created
-                            created_objects.append(obj)
+                                # Object not found, treat as created
+                                created_objects.append(obj)
                     else:
-                        # Object not found, treat as created
-                        created_objects.append(obj)
+                        # No PKs, default all to created
+                        created_objects.extend(objs)
                 else:
                     # No timestamp fields, default to created
-                    created_objects.append(obj)
+                    created_objects.extend(objs)
 
         logger.info(f"Upsert after hooks: {len(created_objects)} created, {len(updated_objects)} updated")
 

django_bulk_hooks/operations/mti_handler.py

@@ -306,6 +306,14 @@ class MTIHandler:
                     if not filtered_updates and normalized_unique:
                         filtered_updates = [normalized_unique[0]]
 
+                    # CRITICAL FIX: Always include auto_now fields in updates to ensure timestamps are updated.
+                    # During MTI upsert, parent tables need auto_now fields updated even when only child fields change.
+                    # This ensures parent-level timestamps (e.g., updated_at) refresh correctly on upsert.
+                    auto_now_fields = self._get_auto_now_fields_for_model(model_class, model_fields_by_name)
+                    if auto_now_fields:
+                        # Convert to set to avoid duplicates, then back to list for consistency
+                        filtered_updates = list(set(filtered_updates) | set(auto_now_fields))
+
                     # Only enable upsert if we have fields to update (real or dummy)
                     if filtered_updates:
                         level_update_conflicts = True
@@ -334,6 +342,14 @@ class MTIHandler:
                         ]
                         level_update_fields = available_fields[:1] if available_fields else [pk_field.name]
 
+                        # CRITICAL FIX: Include auto_now fields in update_fields to ensure timestamps are updated.
+                        # During MTI upsert, parent tables need auto_now fields updated even when using dummy fields.
+                        # This ensures parent-level timestamps (e.g., updated_at) refresh correctly on upsert.
+                        auto_now_fields = self._get_auto_now_fields_for_model(model_class, model_fields_by_name)
+                        if auto_now_fields:
+                            # Convert to set to avoid duplicates, then back to list for consistency
+                            level_update_fields = list(set(level_update_fields) | set(auto_now_fields))
+
             # Create parent level
             parent_level = ParentLevel(
                 model_class=model_class,
@@ -347,6 +363,29 @@ class MTIHandler:
 
         return parent_levels
 
+    def _get_auto_now_fields_for_model(self, model_class, model_fields_by_name):
+        """
+        Get auto_now (not auto_now_add) fields for a specific model.
+        
+        Only includes fields that exist in model_fields_by_name to ensure
+        they're valid local fields for this model level.
+        
+        Args:
+            model_class: Model class to get fields for
+            model_fields_by_name: Dict of valid field names for this model level
+            
+        Returns:
+            List of auto_now field names (excluding auto_now_add)
+        """
+        auto_now_fields = []
+        for field in model_class._meta.local_fields:
+            # Only include auto_now (not auto_now_add) since auto_now_add should only be set on creation
+            if getattr(field, "auto_now", False) and not getattr(field, "auto_now_add", False):
+                # Double-check field exists in model_fields_by_name for safety
+                if field.name in model_fields_by_name:
+                    auto_now_fields.append(field.name)
+        return auto_now_fields
+
     def _has_matching_constraint(self, model_class, normalized_unique):
         """Check if model has a unique constraint matching the given fields."""
         try:

{django_bulk_hooks-0.2.57.dist-info → django_bulk_hooks-0.2.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.2.57
+Version: 0.2.59
 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.57.dist-info → django_bulk_hooks-0.2.59.dist-info}/RECORD

@@ -14,14 +14,14 @@ django_bulk_hooks/models.py,sha256=4Vvi2LiGP0g4j08a5liqBROfsO8Wd_ermBoyjKwfrPU,2
 django_bulk_hooks/operations/__init__.py,sha256=BtJYjmRhe_sScivLsniDaZmBkm0ZLvcmzXFKL7QY2Xg,550
 django_bulk_hooks/operations/analyzer.py,sha256=wAG8sAG9NwfwNqG9z81VfGR7AANDzRmMGE_o82MWji4,10689
 django_bulk_hooks/operations/bulk_executor.py,sha256=Y-wkvuV_X-SZmI965JVrrtwbzPZVggUfy8mR1pzP9d0,27048
-django_bulk_hooks/operations/coordinator.py,sha256=iGavJLqe3eYRqFay8cMn6muwyRYzQo-HFGphsS5hL6g,30799
+django_bulk_hooks/operations/coordinator.py,sha256=1Ka5eZJXTFjx3tr-BD6Tr350Y2T57SUOX3vjagBYBvM,32193
 django_bulk_hooks/operations/field_utils.py,sha256=Tvr5bcZLG8imH-r2S85oui1Cbw6hGv3VtuIMn4OvsU4,2895
-django_bulk_hooks/operations/mti_handler.py,sha256=MMDxuE6jzwkhMwVE-6qJUdp4MNKgAIFPMjwdN_umrqs,23503
+django_bulk_hooks/operations/mti_handler.py,sha256=173jghcxCE5UEZxM1QJRS-lWg0-KJxCQCbWHVKppIEM,26000
 django_bulk_hooks/operations/mti_plans.py,sha256=7STQ2oA2ZT8cEG3-t-6xciRAdf7OeSf0gRLXR_BRG-Q,3363
 django_bulk_hooks/operations/record_classifier.py,sha256=kqML4aO11X9K3SSJ5DUlUukwI172j_Tk12Kr77ee8q8,7065
 django_bulk_hooks/queryset.py,sha256=aQitlbexcVnmeAdc0jtO3hci39p4QEu4srQPEzozy5s,5546
 django_bulk_hooks/registry.py,sha256=uum5jhGI3TPaoiXuA1MdBdu4gbE3rQGGwQ5YDjiMcjk,7949
-django_bulk_hooks-0.2.57.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.2.57.dist-info/METADATA,sha256=SWZOMPOgiBDCLuSxHX9xTeJMqcd3CgvDZP-JuoY4wRs,9265
-django_bulk_hooks-0.2.57.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.2.57.dist-info/RECORD,,
+django_bulk_hooks-0.2.59.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.2.59.dist-info/METADATA,sha256=Zqy1xIlJ4pSLl-rxnjA96tNhdgomhT21cnHI7Z9ZbE8,9265
+django_bulk_hooks-0.2.59.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.2.59.dist-info/RECORD,,