Merge pull request #2 from SectorLabs/foreign-key-bug

Fix bug when using ForeignKey fields

Author: Photonios

psqlextra/compiler.py

@@ -253,9 +253,12 @@ def _format_field_value(self, field_name) -> str:
             in SQL.
         """
 
+        if isinstance(field_name, tuple):
+            field_name, _ = field_name
+
         field = self._get_model_field(field_name)
         return SQLInsertCompiler.prepare_value(
             self,
             field,
-            getattr(self.query.objs[0], field.name)
+            getattr(self.query.objs[0], field_name)
         )

tests/test_on_conflict.py

@@ -263,3 +263,45 @@ def test_on_conflict_unique_together(conflict_action):
     )
 
     assert id1 == id2
+
+
+@pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
+def test_on_conflict_unique_together2(conflict_action):
+    """Asserts that inserts on models with a unique_together
+    works properly."""
+
+    model = get_fake_model(
+        {
+            'name': models.CharField(max_length=140),
+        },
+    )
+
+    model2 = get_fake_model(
+        {
+            'model1': models.ForeignKey(model),
+            'model2': models.ForeignKey(model)
+        },
+        PostgresModel,
+        {
+            'unique_together': ('model1', 'model2')
+        }
+    )
+
+    id1 = model.objects.create(name='one').id
+    id2 = model.objects.create(name='two').id
+
+    assert id1 != id2
+
+    id3 = (
+        model2.objects
+            .on_conflict(['model1_id', 'model2_id'], conflict_action)
+            .insert(model1_id=id1, model2_id=id2)
+    )
+
+    id4 = (
+        model2.objects
+            .on_conflict(['model1_id', 'model2_id'], conflict_action)
+            .insert(model1_id=id1, model2_id=id2)
+    )
+
+    assert id3 == id4