django-bulk-hooks 0.1.252__py3-none-any.whl → 0.1.254__py3-none-any.whl

django_bulk_hooks/queryset.py

@@ -575,6 +575,77 @@ class HookQuerySetMixin:
                     # If no unique fields, treat all as new
                     new_records = objs
                 
+                # Handle auto_now fields intelligently for upsert operations
+                # Only set auto_now fields on records that will actually be created
+                for obj in new_records:
+                    for field in model_cls._meta.local_fields:
+                        if hasattr(field, "auto_now") and field.auto_now:
+                            field.pre_save(obj, add=True)
+                        elif hasattr(field, "auto_now_add") and field.auto_now_add:
+                            if getattr(obj, field.name) is None:
+                                field.pre_save(obj, add=True)
+                
+                # For existing records, preserve their original auto_now values
+                # We'll need to fetch them from the database to preserve the timestamps
+                if existing_records:
+                    # Get the unique field values for existing records
+                    existing_unique_values = []
+                    for obj in existing_records:
+                        unique_value = {}
+                        for field_name in unique_fields:
+                            if hasattr(obj, field_name):
+                                unique_value[field_name] = getattr(obj, field_name)
+                        if unique_value:
+                            existing_unique_values.append(unique_value)
+                    
+                    if existing_unique_values:
+                        # Build filter to fetch existing records
+                        existing_filters = Q()
+                        for unique_value in existing_unique_values:
+                            filter_kwargs = {}
+                            for field_name, value in unique_value.items():
+                                filter_kwargs[field_name] = value
+                            existing_filters |= Q(**filter_kwargs)
+                        
+                        # Fetch existing records to preserve their auto_now values
+                        existing_db_records = model_cls.objects.filter(existing_filters)
+                        existing_db_map = {}
+                        for db_record in existing_db_records:
+                            key = tuple(getattr(db_record, field) for field in unique_fields)
+                            existing_db_map[key] = db_record
+                        
+                        # Preserve auto_now field values for existing records
+                        for obj in existing_records:
+                            key = tuple(getattr(obj, field) for field in unique_fields)
+                            if key in existing_db_map:
+                                db_record = existing_db_map[key]
+                                for field in model_cls._meta.local_fields:
+                                    if hasattr(field, "auto_now") and field.auto_now:
+                                        # Preserve the original updated_at timestamp
+                                        setattr(obj, field.name, getattr(db_record, field.name))
+                
+                # CRITICAL: Exclude auto_now fields from update_fields for existing records
+                # This prevents Django from including them in the ON CONFLICT DO UPDATE clause
+                if existing_records and update_fields:
+                    # Identify auto_now fields that should be excluded from updates
+                    auto_now_fields_to_exclude = set()
+                    for field in model_cls._meta.local_fields:
+                        if hasattr(field, "auto_now") and field.auto_now:
+                            auto_now_fields_to_exclude.add(field.name)
+                    
+                    # Filter out auto_now fields from update_fields for existing records
+                    if auto_now_fields_to_exclude:
+                        # Create a filtered version of update_fields that excludes auto_now fields
+                        filtered_update_fields = [f for f in update_fields if f not in auto_now_fields_to_exclude]
+                        
+                        # Store the original update_fields to restore later
+                        ctx.original_update_fields = update_fields
+                        ctx.auto_now_fields_excluded = auto_now_fields_to_exclude
+                        
+                        # Use the filtered update_fields for the database operation
+                        # This prevents Django from overwriting the timestamps during upsert
+                        update_fields = filtered_update_fields
+                
                 # Run validation hooks on all records
                 if not bypass_validation:
                     engine.run(model_cls, VALIDATE_CREATE, objs, ctx=ctx)
@@ -586,6 +657,15 @@ class HookQuerySetMixin:
                     engine.run(model_cls, BEFORE_UPDATE, existing_records, ctx=ctx)
             else:
                 # For regular create operations, run create hooks before DB ops
+                # Handle auto_now fields normally for new records
+                for obj in objs:
+                    for field in model_cls._meta.local_fields:
+                        if hasattr(field, "auto_now") and field.auto_now:
+                            field.pre_save(obj, add=True)
+                        elif hasattr(field, "auto_now_add") and field.auto_now_add:
+                            if getattr(obj, field.name) is None:
+                                field.pre_save(obj, add=True)
+                
                 if not bypass_validation:
                     engine.run(model_cls, VALIDATE_CREATE, objs, ctx=ctx)
                 engine.run(model_cls, BEFORE_CREATE, objs, ctx=ctx)
@@ -626,6 +706,12 @@ class HookQuerySetMixin:
         # Fire AFTER hooks
         if not bypass_hooks:
             if update_conflicts and unique_fields:
+                # Restore original update_fields if we modified them
+                if hasattr(ctx, 'original_update_fields'):
+                    update_fields = ctx.original_update_fields
+                    delattr(ctx, 'original_update_fields')
+                    delattr(ctx, 'auto_now_fields_excluded')
+                
                 # For upsert operations, we need to determine which records were actually created vs updated
                 # Use the same logic as before to separate records
                 existing_records = []

{django_bulk_hooks-0.1.252.dist-info → django_bulk_hooks-0.1.254.dist-info}/METADATA

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

@@ -9,9 +9,9 @@ django_bulk_hooks/handler.py,sha256=Bx-W6yyiciKMyy-BRxUt3CmRPCrX9_LhQgU-5LaJTjg,
 django_bulk_hooks/manager.py,sha256=nfWiwU5-yAoxdnQsUMohxtyCpkV0MBv6X3wmipr9eQY,3697
 django_bulk_hooks/models.py,sha256=WtSfc4GBOG_oOt8n37cVvid0MtFIGze9JYKSixil2y0,4370
 django_bulk_hooks/priority.py,sha256=HG_2D35nga68lBCZmSXTcplXrjFoRgZFRDOy4ROKonY,376
-django_bulk_hooks/queryset.py,sha256=whv6QunaxRhos0nBlx600mKeleovjdv3XdeMSULh7n8,60739
+django_bulk_hooks/queryset.py,sha256=uuibzsusLx-7g2d-vngOS1RF3Y9SXhqSboudf0ch1DA,66207
 django_bulk_hooks/registry.py,sha256=GRUTGVQEO2sdkC9OaZ9Q3U7mM-3Ix83uTyvrlTtpatw,1317
-django_bulk_hooks-0.1.252.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
-django_bulk_hooks-0.1.252.dist-info/METADATA,sha256=xg9nPjRhZJPXem1plWls94mzENbAAoNiWI43J931rpE,9061
-django_bulk_hooks-0.1.252.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_bulk_hooks-0.1.252.dist-info/RECORD,,
+django_bulk_hooks-0.1.254.dist-info/LICENSE,sha256=dguKIcbDGeZD-vXWdLyErPUALYOvtX_fO4Zjhq481uk,1088
+django_bulk_hooks-0.1.254.dist-info/METADATA,sha256=VxFyyCmAliymcO_xC9o5SY3phyXPeV53kskNhA3AAXk,9061
+django_bulk_hooks-0.1.254.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_bulk_hooks-0.1.254.dist-info/RECORD,,