fix: on conflict do nothing (#1123)

tortoise · May 8, 2022 · 854998d · 854998d
1 parent aa3d511
commit 854998d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -18,6 +18,7 @@ Added
 Fixed
 ^^^^^
 - `TimeField` for `MySQL` will return `datetime.timedelta` object instead of `datetime.time` object.
+- Fix on conflict do nothing. (#1122)
 
 0.19.0
 ------

diff --git a/tests/test_bulk.py b/tests/test_bulk.py
@@ -132,6 +132,7 @@ async def test_bulk_create_uuidpk_in_transaction_fail(self):
     async def test_bulk_create_ignore_conflicts(self):
         name1 = UniqueName(name="name1")
         name2 = UniqueName(name="name2")
+        await UniqueName.bulk_create([name1, name2])
         await UniqueName.bulk_create([name1, name2], ignore_conflicts=True)
         with self.assertRaises(IntegrityError):
             await UniqueName.bulk_create([name1, name2])
diff --git a/tortoise/backends/base/executor.py b/tortoise/backends/base/executor.py
@@ -208,7 +208,7 @@ def _prepare_insert_statement(
             .insert(*[self.parameter(i) for i in range(len(columns))])
         )
         if ignore_conflicts:
-            query = query.do_nothing()
+            query = query.on_conflict().do_nothing()
         return query
 
     async def _process_insert_result(self, instance: "Model", results: Any) -> None:

diff --git a/tortoise/backends/base_postgres/executor.py b/tortoise/backends/base_postgres/executor.py
@@ -46,7 +46,7 @@ def _prepare_insert_statement(
             if generated_fields:
                 query = query.returning(*generated_fields)
         if ignore_conflicts:
-            query = query.do_nothing()
+            query = query.on_conflict().do_nothing()
         return query
 
     async def _process_insert_result(self, instance: Model, results: Optional[dict]) -> None: