django-bulk-hooks 0.2.26__tar.gz → 0.2.28__tar.gz

{django_bulk_hooks-0.2.26 → django_bulk_hooks-0.2.28}/PKG-INFO

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

@@ -455,69 +455,23 @@ class BulkExecutor:
                 case_statements = {}
                 for field_name in field_group.fields:
                     field = field_group.model_class._meta.get_field(field_name)
-
-                    # Use column name for FK fields
-                    if getattr(field, "is_relation", False) and hasattr(field, "attname"):
-                        db_field_name = field.attname
-                        # Get the field object for the database column, not the target field
-                        target_field = field_group.model_class._meta.get_field(field.attname)
-                        logger.error(f"DEBUG FK FIELD RESOLUTION: field_name={field_name}, db_field_name={db_field_name}")
-                        logger.error(f"DEBUG FK ORIGINAL FIELD: {field}")
-                        logger.error(f"DEBUG FK TARGET FIELD: {target_field}")
-                        logger.error(f"DEBUG FK TARGET FIELD TYPE: {type(target_field)}")
-                        logger.error(f"DEBUG FK TARGET FIELD CLASS: {target_field.__class__}")
-                    else:
-                        db_field_name = field_name
-                        target_field = field
-
                     when_statements = []
+
                     for pk, obj in zip(root_pks, plan.objects):
                         obj_pk = getattr(obj, "pk", None) or getattr(obj, "id", None)
                         if obj_pk is None:
                             continue
 
-                        value = getattr(obj, db_field_name)
-
-                        # For FK fields, ensure we get the actual ID value, not the related object
-                        if getattr(field, "is_relation", False) and hasattr(field, "attname"):
-                            # ADD DEBUG LOGGING
-                            logger.error(f"DEBUG FK CONVERSION: field={field_name}, db_field={db_field_name}")
-                            logger.error(f"DEBUG FK VALUE BEFORE: value={value!r}, type={type(value)}")
-                            logger.error(f"DEBUG FK field.attname={field.attname}, field.target_field={getattr(field, 'target_field', 'N/A')}")
-                            
-                            # If value is a model instance, get its pk
-                            if value is not None and hasattr(value, "pk"):
-                                value = value.pk
-                                logger.error(f"DEBUG FK: Extracted pk from model instance: {value!r}")
-                            # If value is a string representation of an ID, convert to int
-                            elif value is not None and isinstance(value, str):
-                                logger.error(f"DEBUG FK: Value is string, isdigit()={value.isdigit()}")
-                                if value.isdigit():
-                                    value = int(value)
-                                    logger.error(f"DEBUG FK: Converted string to int: {value!r}")
-                                elif value == "":
-                                    value = None
-                                    logger.error(f"DEBUG FK: Converted empty string to None")
-                                else:
-                                    logger.error(f"DEBUG FK: String value doesn't pass isdigit() check! ASCII codes: {[ord(c) for c in value]}")
-                            
-                            logger.error(f"DEBUG FK VALUE AFTER: value={value!r}, type={type(value)}")
-
-                        # Create the Value expression - always use output_field to ensure correct type casting
-                        value_expr = Value(value, output_field=target_field)
-                        logger.error(f"DEBUG VALUE EXPRESSION: value={value!r}, output_field={target_field}, value_expr={value_expr}")
-                        
+                        value = getattr(obj, field_name)
                         when_statements.append(
                             When(
                                 **{field_group.filter_field: pk},
-                                then=value_expr,
+                                then=Value(value, output_field=field),
                             ),
                         )
 
                     if when_statements:
-                        case_statements[db_field_name] = Case(
-                            *when_statements, output_field=target_field,
-                        )
+                        case_statements[field_name] = Case(*when_statements, output_field=field)
 
                 # Execute bulk update
                 if case_statements:

{django_bulk_hooks-0.2.26 → django_bulk_hooks-0.2.28}/pyproject.toml

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