INTPYTHON-654 Add options kwarg to parse_uri

Author: aclark4life

django_mongodb_backend/utils.py

@@ -28,7 +28,7 @@ def check_django_compatability():
         )
 
 
-def parse_uri(uri, *, db_name=None, test=None):
+def parse_uri(uri, *, db_name=None, test=None, options=None):
     """
     Convert the given uri into a dictionary suitable for Django's DATABASES
     setting.
@@ -48,14 +48,17 @@ def parse_uri(uri, *, db_name=None, test=None):
     db_name = db_name or uri["database"]
     if not db_name:
         raise ImproperlyConfigured("You must provide the db_name parameter.")
+    opts = uri.get("options")
+    if options:
+        opts = {**opts, **options}
     settings_dict = {
         "ENGINE": "django_mongodb_backend",
         "NAME": db_name,
         "HOST": host,
         "PORT": port,
         "USER": uri.get("username"),
         "PASSWORD": uri.get("password"),
-        "OPTIONS": uri.get("options"),
+        "OPTIONS": opts,
     }
     if "authSource" not in settings_dict["OPTIONS"] and uri["database"]:
         settings_dict["OPTIONS"]["authSource"] = uri["database"]

tests/backend_/utils/test_parse_uri.py

@@ -94,3 +94,11 @@ def test_invalid_credentials(self):
     def test_no_scheme(self):
         with self.assertRaisesMessage(pymongo.errors.InvalidURI, "Invalid URI scheme"):
             parse_uri("cluster0.example.mongodb.net")
+
+    def test_options_kwarg(self):
+        options = {"authSource": "auth"}
+        settings_dict = parse_uri(
+            "mongodb://cluster0.example.mongodb.net/myDatabase",
+            options=options,
+        )
+        self.assertEqual(settings_dict["OPTIONS"], {"authSource": "auth"})