Add extra tests for specific conflict actions

Author: Photonios

psqlextra/compiler.py

@@ -91,6 +91,9 @@ def _rewrite_insert(self, sql, params, return_id=False):
         ) % str(self.query.conflict_action))
 
     def _rewrite_insert_update(self, sql, params, returning):
+        """Rewrites a formed SQL INSERT query to include
+        the ON CONFLICT DO UPDATE clause."""
+
         update_columns = ', '.join([
             '{0} = EXCLUDED.{0}'.format(self.qn(field.column))
             for field in self.query.update_fields
@@ -114,6 +117,9 @@ def _rewrite_insert_update(self, sql, params, returning):
         )
 
     def _rewrite_insert_nothing(self, sql, params, returning):
+        """Rewrites a formed SQL INSERT query to include
+        the ON CONFLICT DO NOTHING clause."""
+
         # build the conflict target, the columns to watch
         # for conflicts
         conflict_target = self._build_conflict_target()

tests/test_on_conflict.py

@@ -12,7 +12,7 @@
 
 
 @pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
-def test_simple(conflict_action):
+def test_on_conflict(conflict_action):
     """Tests whether simple inserts work correctly."""
 
     model = get_fake_model({
@@ -40,7 +40,7 @@ def test_simple(conflict_action):
 
 
 @pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
-def test_auto_fields(conflict_action):
+def test_on_conflict_auto_fields(conflict_action):
     """Asserts that fields that automatically add something
     to the model automatically still work properly when upserting."""
 
@@ -81,7 +81,7 @@ def test_auto_fields(conflict_action):
 
 
 @pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
-def test_foreign_key(conflict_action):
+def test_on_conflict_foreign_key(conflict_action):
     """Asserts that models with foreign key relationships
     can safely be inserted."""
 
@@ -125,7 +125,7 @@ def test_foreign_key(conflict_action):
 
 
 @pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
-def test_get_partial(conflict_action):
+def test_on_conflict_partial_get(conflict_action):
     """Asserts that when doing a insert_and_get with
     only part of the columns on the model, all fields
     are returned properly."""
@@ -162,7 +162,7 @@ def test_get_partial(conflict_action):
 
 
 @pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
-def test_invalid_conflict_target(conflict_action):
+def test_on_conflict_invalid_target(conflict_action):
     """Tests whether specifying a invalid value
     for `conflict_target` raises an error."""
 
@@ -186,7 +186,7 @@ def test_invalid_conflict_target(conflict_action):
 
 
 @pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
-def test_outdated_model(conflict_action):
+def test_on_conflict_outdated_model(conflict_action):
     """Tests whether insert properly handles
     fields that are in the database but not on the model.
 

tests/test_on_conflict_nothing.py

@@ -0,0 +1,41 @@
+from django.db import models
+
+from psqlextra import HStoreField
+from psqlextra.query import ConflictAction
+
+from .fake_model import get_fake_model
+
+
+def test_on_conflict_nothing():
+    """Tests whether simple insert NOTHING works correctly."""
+
+    model = get_fake_model({
+        'title': HStoreField(uniqueness=['key1']),
+        'cookies': models.CharField(max_length=255, null=True)
+    })
+
+    obj1 = (
+        model.objects
+        .on_conflict([('title', 'key1')], ConflictAction.NOTHING)
+        .insert_and_get(title={'key1': 'beer'}, cookies='cheers')
+    )
+
+    obj1.refresh_from_db()
+    assert obj1.title['key1'] == 'beer'
+    assert obj1.cookies == 'cheers'
+
+    obj2 = (
+        model.objects
+        .on_conflict([('title', 'key1')], ConflictAction.NOTHING)
+        .insert_and_get(title={'key1': 'beer'}, cookies='choco')
+    )
+
+    obj1.refresh_from_db()
+    obj2.refresh_from_db()
+
+    # assert that the 'cookies' field didn't change
+    assert obj1.id == obj2.id
+    assert obj1.title['key1'] == 'beer'
+    assert obj1.cookies == 'cheers'
+    assert obj2.title['key1'] == 'beer'
+    assert obj2.cookies == 'cheers'

tests/test_on_conflict_update.py

@@ -0,0 +1,41 @@
+from django.db import models
+
+from psqlextra import HStoreField
+from psqlextra.query import ConflictAction
+
+from .fake_model import get_fake_model
+
+
+def test_on_conflict_update():
+    """Tests whether simple upserts works correctly."""
+
+    model = get_fake_model({
+        'title': HStoreField(uniqueness=['key1']),
+        'cookies': models.CharField(max_length=255, null=True)
+    })
+
+    obj1 = (
+        model.objects
+        .on_conflict([('title', 'key1')], ConflictAction.UPDATE)
+        .insert_and_get(title={'key1': 'beer'}, cookies='cheers')
+    )
+
+    obj1.refresh_from_db()
+    assert obj1.title['key1'] == 'beer'
+    assert obj1.cookies == 'cheers'
+
+    obj2 = (
+        model.objects
+        .on_conflict([('title', 'key1')], ConflictAction.UPDATE)
+        .insert_and_get(title={'key1': 'beer'}, cookies='choco')
+    )
+
+    obj1.refresh_from_db()
+    obj2.refresh_from_db()
+
+    # assert both objects are the same
+    assert obj1.id == obj2.id
+    assert obj1.title['key1'] == 'beer'
+    assert obj1.cookies == 'choco'
+    assert obj2.title['key1'] == 'beer'
+    assert obj2.cookies == 'choco'