Merge branch 'main' into expr-support-getfield

Author: Jibola

.github/workflows/codeql.yml

@@ -50,13 +50,13 @@ jobs:
         ref: ${{ inputs.ref }}
         persist-credentials: false
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
+      uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
       with:
         languages: ${{ matrix.language }}
         build-mode: none
@@ -72,6 +72,6 @@ jobs:
         pip install -e .
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
+      uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
       with:
         category: "/language:${{ matrix.language }}"

.github/workflows/dist.yml

@@ -24,7 +24,7 @@ jobs:
         ref: ${{ inputs.ref }}
         persist-credentials: false
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Install dependencies

.github/workflows/linters.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.10'
           cache: 'pip'
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'

.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"},

.github/workflows/release-python.yml

@@ -80,14 +80,14 @@ jobs:
           name: all-dist-${{ github.run_id }}
           path: dist/
       - name: Publish package distributions to TestPyPI
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # release/v1
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # 1.13.0
         with:
           repository-url: https://test.pypi.org/legacy/
           skip-existing: true
           attestations: ${{ env.DRY_RUN }}
       - name: Publish package distributions to PyPI
         if: startsWith(env.DRY_RUN, 'false')
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # release/v1
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # 1.13.0
 
   post-publish:
     needs: [publish]

README.md

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

django_mongodb_backend/base.py

@@ -11,6 +11,7 @@
 from pymongo.collection import Collection
 from pymongo.driver_info import DriverInfo
 from pymongo.mongo_client import MongoClient
+from pymongo.uri_parser import parse_uri
 
 from . import __version__ as django_mongodb_backend_version
 from . import dbapi as Database
@@ -157,6 +158,18 @@ def __init__(self, settings_dict, alias=DEFAULT_DB_ALIAS):
         self.in_atomic_block_mongo = False
         # Current number of nested 'atomic' calls.
         self.nested_atomics = 0
+        # If database "NAME" isn't specified, try to get it from HOST, if it's
+        # a connection string.
+        if self.settings_dict["NAME"] == "":  # Empty string = unspecified; None = _nodb_cursor()
+            name_is_missing = True
+            host = self.settings_dict["HOST"]
+            if host.startswith(("mongodb://", "mongodb+srv://")):
+                uri = parse_uri(host)
+                if database := uri.get("database"):
+                    self.settings_dict["NAME"] = database
+                    name_is_missing = False
+            if name_is_missing:
+                raise ImproperlyConfigured('settings.DATABASES is missing the "NAME" value.')
 
     def get_collection(self, name, **kwargs):
         collection = Collection(self.database, name, **kwargs)
@@ -183,15 +196,19 @@ def init_connection_state(self):
 
     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"],
         }
+        # MongoClient uses any of these parameters (including "OPTIONS" above)
+        # to override any corresponding values in a connection string "HOST".
+        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):

django_mongodb_backend/query.py

@@ -11,7 +11,7 @@
 from django.db.models.sql.where import AND, OR, XOR, ExtraWhere, NothingNode, WhereNode
 from pymongo.errors import BulkWriteError, DuplicateKeyError, PyMongoError
 
-from django_mongodb_backend.query_conversion.query_optimizer import QueryOptimizer
+from .query_conversion.query_optimizer import convert_expr_to_match
 
 
 def wrap_database_errors(func):
@@ -90,7 +90,7 @@ def get_pipeline(self):
         for query in self.subqueries or ():
             pipeline.extend(query.get_pipeline())
         if self.match_mql:
-            pipeline.extend(self.query_optimizer.convert_expr_to_match(self.match_mql))
+            pipeline.extend(convert_expr_to_match(self.match_mql))
         if self.aggregation_pipeline:
             pipeline.extend(self.aggregation_pipeline)
         if self.project_fields: