Fix 'pk' not being considered a valid field in deciding which fields update/insert

Fixes #24

Author: Photonios

psqlextra/compiler.py

@@ -219,6 +219,7 @@ def _get_model_field(self, name: str):
         # key of a model, we have to respect this de-facto standard behaviour
         if field_name == 'pk' and self.query.model._meta.pk:
             return self.query.model._meta.pk
+
         for field in self.query.model._meta.local_concrete_fields:
             if field.name == field_name or field.column == field_name:
                 return field

psqlextra/manager.py

@@ -328,6 +328,14 @@ def _get_upsert_fields(self, kwargs):
                 update_fields.append(field)
                 continue
 
+            # special handling for 'pk' which always refers to
+            # the primary key, so if we the user specifies `pk`
+            # instead of a concrete field, we have to handle that
+            if field.primary_key is True and 'pk' in kwargs:
+                insert_fields.append(field)
+                update_fields.append(field)
+                continue
+
             if self._is_magical_field(model_instance, field, is_insert=True):
                 insert_fields.append(field)
 

tests/test_on_conflict.py

@@ -330,3 +330,6 @@ def test_on_conflict_pk_conflict_target(conflict_action):
 
     assert obj1.name == 'beer'
     assert obj2.name == 'beer'
+    assert obj1.id == obj2.id
+    assert obj1.id == 0
+    assert obj2.id == 0