django-bulk-hooks 0.1.269__tar.gz → 0.1.271__tar.gz

{django_bulk_hooks-0.1.269 → django_bulk_hooks-0.1.271}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-bulk-hooks
-Version: 0.1.269
+Version: 0.1.271
 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.269 → django_bulk_hooks-0.1.271}/django_bulk_hooks/queryset.py

@@ -532,31 +532,41 @@ class HookQuerySetMixin:
                 unique_values = []
                 for obj in objs:
                     unique_value = {}
+                    query_fields = {}  # Track which database field to use for each unique field
                     for field_name in unique_fields:
                         if hasattr(obj, field_name):
                             unique_value[field_name] = getattr(obj, field_name)
+                            query_fields[field_name] = field_name
                         elif hasattr(obj, field_name + '_id'):
                             # Handle ForeignKey fields where _id suffix is used
                             unique_value[field_name] = getattr(obj, field_name + '_id')
+                            query_fields[field_name] = field_name + '_id'  # Use _id field for query
                     if unique_value:
-                        unique_values.append(unique_value)
+                        unique_values.append((unique_value, query_fields))
 
                 if unique_values:
                     # Query the database to see which records already exist - SINGLE BULK QUERY
                     from django.db.models import Q
 
                     existing_filters = Q()
-                    for unique_value in unique_values:
+                    for unique_value, query_fields in unique_values:
                         filter_kwargs = {}
                         for field_name, value in unique_value.items():
-                            filter_kwargs[field_name] = value
+                            # Use the correct database field name (may include _id suffix)
+                            db_field_name = query_fields[field_name]
+                            filter_kwargs[db_field_name] = value
                         existing_filters |= Q(**filter_kwargs)
 
+                    logger.debug(f"DEBUG: Existence check query filters: {existing_filters}")
+                    logger.debug(f"DEBUG: Unique fields for values_list: {unique_fields}")
+
                     # Get all existing records in one query and create a lookup set
+                    # We need to use the original unique_fields for values_list to maintain consistency
                     existing_records_lookup = set()
-                    for existing_record in model_cls.objects.filter(
-                        existing_filters
-                    ).values_list(*unique_fields):
+                    existing_query = model_cls.objects.filter(existing_filters)
+                    logger.debug(f"DEBUG: Existence check SQL: {existing_query.query}")
+
+                    for existing_record in existing_query.values_list(*unique_fields):
                         # Convert tuple to a hashable key for lookup
                         existing_records_lookup.add(existing_record)
 

{django_bulk_hooks-0.1.269 → django_bulk_hooks-0.1.271}/pyproject.toml

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