Fix on_conflict for models with unique_together + tests

Author: Photonios

psqlextra/compiler.py

@@ -124,7 +124,7 @@ def _rewrite_insert_nothing(self, sql, params, returning):
         # for conflicts
         conflict_target = self._build_conflict_target()
 
-        where_clause = ', '.join([
+        where_clause = ' AND '.join([
             '{0} = %s'.format(self._format_field_name(field_name))
             for field_name in self.query.conflict_target
         ])
@@ -143,7 +143,7 @@ def _rewrite_insert_nothing(self, sql, params, returning):
         return (
             (
                 'WITH insdata AS ('
-                '{insert} ON CONFLICT ({conflict_target}) DO UPDATE'
+                '{insert} ON CONFLICT {conflict_target} DO UPDATE'
                 ' SET id = NULL WHERE FALSE RETURNING {returning})'
                 ' SELECT * FROM insdata UNION ALL'
                 ' SELECT {returning} FROM {table} WHERE {where_clause} LIMIT 1;'

tests/fake_model.py

@@ -7,13 +7,14 @@
 from psqlextra.models import PostgresModel
 
 
-def define_fake_model(fields=None, model_base=PostgresModel):
+def define_fake_model(fields=None, model_base=PostgresModel, meta_options={}):
     name = str(uuid.uuid4()).replace('-', '')[:8]
 
     attributes = {
         'app_label': 'tests',
         '__module__': __name__,
-        '__name__': name
+        '__name__': name,
+        'Meta': type('Meta', (object,), meta_options)
     }
 
     if fields:
@@ -23,10 +24,10 @@ def define_fake_model(fields=None, model_base=PostgresModel):
     return model
 
 
-def get_fake_model(fields=None, model_base=PostgresModel):
+def get_fake_model(fields=None, model_base=PostgresModel, meta_options={}):
     """Creates a fake model to use during unit tests."""
 
-    model = define_fake_model(fields, model_base)
+    model = define_fake_model(fields, model_base, meta_options)
 
     class TestProject:
 

tests/test_on_conflict.py

@@ -4,6 +4,7 @@
 
 from psqlextra import HStoreField
 from psqlextra.query import ConflictAction
+from psqlextra.models import PostgresModel
 
 from .fake_model import get_fake_model
 
@@ -215,6 +216,7 @@ def test_on_conflict_outdated_model(conflict_action):
         .insert_and_get(title='beer')
     )
 
+
 @pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
 def test_on_conflict_custom_column_names(conflict_action):
     """Asserts that models with custom column names (models
@@ -225,8 +227,39 @@ def test_on_conflict_custom_column_names(conflict_action):
         'description': models.CharField(max_length=255, db_column='desc')
     })
 
-    id = (
+    (
         model.objects
         .on_conflict(['title'], conflict_action)
         .insert(title='yeey', description='great thing')
     )
+
+
+@pytest.mark.parametrize("conflict_action", CONFLICT_ACTIONS)
+def test_on_conflict_unique_together(conflict_action):
+    """Asserts that inserts on models with a unique_together
+    works properly."""
+
+    model = get_fake_model(
+        {
+            'first_name': models.CharField(max_length=140),
+            'last_name': models.CharField(max_length=255)
+        },
+        PostgresModel,
+        {
+            'unique_together': ('first_name', 'last_name')
+        }
+    )
+
+    id1 = (
+        model.objects
+        .on_conflict(['first_name', 'last_name'], conflict_action)
+        .insert(first_name='swen', last_name='kooij')
+    )
+
+    id2 = (
+        model.objects
+        .on_conflict(['first_name', 'last_name'], conflict_action)
+        .insert(first_name='swen', last_name='kooij')
+    )
+
+    assert id1 == id2

tests/test_upsert.py

@@ -1,7 +1,6 @@
 from django.db import models
 
 from psqlextra import HStoreField
-from psqlextra.query import ConflictAction
 
 from .fake_model import get_fake_model