Add tests for foreign key as id

To ensure that this works too.

Author: PeterJCLaw

tests/test_on_conflict_nothing.py

@@ -42,10 +42,10 @@ def test_on_conflict_nothing():
     assert obj2.cookies == 'cheers'
 
 
-def test_on_conflict_nothing_foreign_key():
+def test_on_conflict_nothing_foreign_key_by_object():
     """
     Tests whether simple insert NOTHING works correctly when the potentially
-    conflicting field is a foreign key.
+    conflicting field is a foreign key specified as an object.
     """
 
     other_model = get_fake_model({})
@@ -98,3 +98,54 @@ def test_on_conflict_nothing_foreign_key():
     assert obj2.other == other_obj
     assert obj1.data == "some data"
     assert obj2.data == "some data"
+
+
+def test_on_conflict_nothing_foreign_key_by_id():
+    """
+    Tests whether simple insert NOTHING works correctly when the potentially
+    conflicting field is a foreign key specified as an id.
+    """
+
+    other_model = get_fake_model({})
+
+    model = get_fake_model({
+        'other': models.OneToOneField(
+            other_model,
+            on_delete=models.CASCADE,
+        ),
+        'data': models.CharField(max_length=255),
+    })
+
+    other_obj = other_model.objects.create()
+
+    obj1 = (
+        model.objects
+        .on_conflict(['other_id'], ConflictAction.NOTHING)
+        .insert_and_get(other_id=other_obj.pk, data="some data")
+    )
+
+    assert obj1.other == other_obj
+    assert obj1.data == "some data"
+
+    obj1.refresh_from_db()
+    assert obj1.other == other_obj
+    assert obj1.data == "some data"
+
+    obj2 = (
+        model.objects
+        .on_conflict(['other_id'], ConflictAction.NOTHING)
+        .insert_and_get(other_id=other_obj.pk, data="different data")
+    )
+
+    assert obj2.other == other_obj
+    assert obj2.data == "some data"
+
+    obj1.refresh_from_db()
+    obj2.refresh_from_db()
+
+    # assert that the 'other' field didn't change
+    assert obj1.id == obj2.id
+    assert obj1.other == other_obj
+    assert obj2.other == other_obj
+    assert obj1.data == "some data"
+    assert obj2.data == "some data"

tests/test_on_conflict_update.py

@@ -42,10 +42,10 @@ def test_on_conflict_update():
     assert obj2.cookies == 'choco'
 
 
-def test_on_conflict_update_foreign_key():
+def test_on_conflict_update_foreign_key_by_object():
     """
     Tests whether simple upsert works correctly when the conflicting field is a
-    foreign key.
+    foreign key specified as an object.
     """
 
     other_model = get_fake_model({})
@@ -98,3 +98,54 @@ def test_on_conflict_update_foreign_key():
     assert obj2.other == other_obj
     assert obj1.data == "different data"
     assert obj2.data == "different data"
+
+
+def test_on_conflict_update_foreign_key_by_id():
+    """
+    Tests whether simple upsert works correctly when the conflicting field is a
+    foreign key specified as an id.
+    """
+
+    other_model = get_fake_model({})
+
+    model = get_fake_model({
+        'other': models.OneToOneField(
+            other_model,
+            on_delete=models.CASCADE,
+        ),
+        'data': models.CharField(max_length=255),
+    })
+
+    other_obj = other_model.objects.create()
+
+    obj1 = (
+        model.objects
+        .on_conflict(['other_id'], ConflictAction.UPDATE)
+        .insert_and_get(other_id=other_obj.pk, data="some data")
+    )
+
+    assert obj1.other == other_obj
+    assert obj1.data == "some data"
+
+    obj1.refresh_from_db()
+    assert obj1.other == other_obj
+    assert obj1.data == "some data"
+
+    obj2 = (
+        model.objects
+        .on_conflict(['other_id'], ConflictAction.UPDATE)
+        .insert_and_get(other_id=other_obj.pk, data="different data")
+    )
+
+    assert obj2.other == other_obj
+    assert obj2.data == "different data"
+
+    obj1.refresh_from_db()
+    obj2.refresh_from_db()
+
+    # assert that the 'other' field didn't change
+    assert obj1.id == obj2.id
+    assert obj1.other == other_obj
+    assert obj2.other == other_obj
+    assert obj1.data == "different data"
+    assert obj2.data == "different data"