raise "duplicate key error" as IntegrityError

Author: timgraham

django_mongodb/features.py

@@ -126,10 +126,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         # subclasses of BaseDatabaseIntrospection may require a get_constraints() method
         "migrations.test_operations.OperationTests.test_add_func_unique_constraint",
         "migrations.test_operations.OperationTests.test_remove_func_unique_constraint",
-        # MongoDB's "duplicate key error" must be raised as IntegrityError, not
-        # DatabaseError.
-        "force_insert_update.tests.ForceInsertInheritanceTests.test_force_insert_diamond_mti",
-        "force_insert_update.tests.ForceTests.test_force_update",
     }
     # $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3.
     _django_test_expected_failures_bitwise = {

django_mongodb/query.py

@@ -9,14 +9,18 @@
 from django.db.models.sql.constants import INNER
 from django.db.models.sql.datastructures import Join
 from django.db.models.sql.where import AND, OR, XOR, ExtraWhere, NothingNode, WhereNode
-from pymongo.errors import DuplicateKeyError, PyMongoError
+from pymongo.errors import BulkWriteError, DuplicateKeyError, PyMongoError
 
 
 def wrap_database_errors(func):
     @wraps(func)
     def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
+        except BulkWriteError as e:
+            if "E11000 duplicate key error" in str(e):
+                raise IntegrityError from e
+            raise
         except DuplicateKeyError as e:
             raise IntegrityError from e
         except PyMongoError as e: