INTPYTHON-743 Allow using MongoDB connection string in DATABASES["HOST"]

Author: timgraham

.github/workflows/mongodb_settings.py

@@ -1,13 +1,16 @@
 import os
 
-from django_mongodb_backend import parse_uri
+from pymongo.uri_parser import parse_uri
 
 if mongodb_uri := os.getenv("MONGODB_URI"):
-    db_settings = parse_uri(mongodb_uri, db_name="dummy")
-
+    db_settings = {
+        "ENGINE": "django_mongodb_backend",
+        "HOST": mongodb_uri,
+    }
     # Workaround for https://github.com/mongodb-labs/mongo-orchestration/issues/268
-    if db_settings["USER"] and db_settings["PASSWORD"]:
-        db_settings["OPTIONS"].update({"tls": True, "tlsAllowInvalidCertificates": True})
+    uri = parse_uri(mongodb_uri)
+    if uri.get("username") and uri.get("password"):
+        db_settings["OPTIONS"] = {"tls": True, "tlsAllowInvalidCertificates": True}
     DATABASES = {
         "default": {**db_settings, "NAME": "djangotests"},
         "other": {**db_settings, "NAME": "djangotests-other"},

README.md

@@ -45,9 +45,10 @@ setting like so:
 
 ```python
 DATABASES = {
-    "default": django_mongodb_backend.parse_uri(
-        "<CONNECTION_STRING_URI>", db_name="example"
-    ),
+    "default": {
+        "HOST": "<CONNECTION_STRING_URI>",
+        "NAME": "db_name",
+    },
 }
 ```
 

django_mongodb_backend/base.py

@@ -185,13 +185,17 @@ def get_connection_params(self):
         settings_dict = self.settings_dict
         if not settings_dict["NAME"]:
             raise ImproperlyConfigured('settings.DATABASES is missing the "NAME" value.')
-        return {
+        params = {
             "host": settings_dict["HOST"] or None,
-            "port": int(settings_dict["PORT"] or 27017),
-            "username": settings_dict.get("USER"),
-            "password": settings_dict.get("PASSWORD"),
             **settings_dict["OPTIONS"],
         }
+        if user := settings_dict.get("USER"):
+            params["username"] = user
+        if password := settings_dict.get("PASSWORD"):
+            params["password"] = password
+        if port := settings_dict.get("PORT"):
+            params["port"] = int(port)
+        return params
 
     @async_unsafe
     def get_new_connection(self, conn_params):

docs/source/intro/configure.rst

@@ -105,8 +105,21 @@ to match the first two numbers from your version.)
 Configuring the ``DATABASES`` setting
 =====================================
 
-After you've set up a project, configure Django's :setting:`DATABASES` setting
-similar to this::
+After you've set up a project, configure Django's :setting:`DATABASES` setting.
+
+If you have a connection string, you can provide it like this::
+
+    DATABASES = {
+        "default": {
+            "ENGINE": "django_mongodb_backend",
+            "HOST": "mongodb+srv://my_user:my_password@cluster0.example.mongodb.net/myDatabase?retryWrites=true&w=majority&tls=false",
+            "NAME": "my_database",
+        },
+    }
+
+Alternatively, you can separate the connection string so that your settings
+look more like what you usually see with Django. This constructs a
+:setting:`DATABASES` setting equivalent to the first example::
 
     DATABASES = {
         "default": {
@@ -117,7 +130,6 @@ similar to this::
             "PASSWORD": "my_password",
             "PORT": 27017,
             "OPTIONS": {
-                # Example:
                 "retryWrites": "true",
                 "w": "majority",
                 "tls": "false",
@@ -128,8 +140,8 @@ similar to this::
 For a localhost configuration, you can omit :setting:`HOST` or specify
 ``"HOST": "localhost"``.
 
-:setting:`HOST` only needs a scheme prefix for SRV connections
-(``mongodb+srv://``). A ``mongodb://`` prefix is never required.
+If you provide a connection string in ``HOST``, any of the other values below
+will override the values in the connection string.
 
 :setting:`OPTIONS` is an optional dictionary of parameters that will be passed
 to :class:`~pymongo.mongo_client.MongoClient`.
@@ -143,17 +155,6 @@ For a replica set or sharded cluster where you have multiple hosts, include
 all of them in :setting:`HOST`, e.g.
 ``"mongodb://mongos0.example.com:27017,mongos1.example.com:27017"``.
 
-Alternatively, if you prefer to simply paste in a MongoDB URI rather than parse
-it into the format above, you can use
-:func:`~django_mongodb_backend.utils.parse_uri`::
-
-    import django_mongodb_backend
-
-    MONGODB_URI = "mongodb+srv://my_user:my_password@cluster0.example.mongodb.net/myDatabase?retryWrites=true&w=majority&tls=false"
-    DATABASES["default"] = django_mongodb_backend.parse_uri(MONGODB_URI)
-
-This constructs a :setting:`DATABASES` setting equivalent to the first example.
-
 .. _configuring-database-routers-setting:
 
 Configuring the ``DATABASE_ROUTERS`` setting

docs/source/releases/5.2.x.rst

@@ -2,6 +2,18 @@
 Django MongoDB Backend 5.2.x
 ============================
 
+5.2.1
+=====
+
+*Unreleased*
+
+New features
+------------
+
+- Allowed specifying the MongoDB connection string in ``DATABASES["HOST"]``,
+  eliminating the need to use :func:`~django_mongodb_backend.utils.parse_uri`
+  to configure the :setting:`DATABASES` setting.
+
 5.2.0
 =====
 

tests/backend_/test_base.py

@@ -56,6 +56,22 @@ def test_options(self):
         params = DatabaseWrapper(settings).get_connection_params()
         self.assertEqual(params["extra"], "option")
 
+    def test_unspecified_settings_omitted(self):
+        settings = connection.settings_dict.copy()
+        # django.db.utils.ConnectionHandler sets unspecified values to an empty
+        # string.
+        settings.update(
+            {
+                "USER": "",
+                "PASSWORD": "",
+                "PORT": "",
+            }
+        )
+        params = DatabaseWrapper(settings).get_connection_params()
+        self.assertNotIn("username", params)
+        self.assertNotIn("password", params)
+        self.assertNotIn("port", params)
+
 
 class DatabaseWrapperConnectionTests(TestCase):
     def test_set_autocommit(self):