[5.1.x] Backports for 5.1.0b4 release

.github/workflows/zizmor.yml

@@ -17,16 +17,5 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - name: Setup Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-      - name: Get zizmor
-        run: cargo install zizmor
       - name: Run zizmor
-        run: zizmor --format sarif . > results.sarif
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: results.sarif
-          category: zizmor
+        uses: zizmorcore/zizmor-action@1c7106082dbc1753372e3924b7da1b9417011a21

django_mongodb_backend/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "5.1.0b4.dev0"
+__version__ = "5.1.0b4"
 
 # Check Django compatibility before other imports which may fail if the
 # wrong version of Django is installed.

django_mongodb_backend/compiler.py

@@ -260,7 +260,6 @@ def execute_sql(
             else:
                 return self._make_result(obj, self.columns)
         # result_type is MULTI
-        cursor.batch_size(chunk_size)
         result = self.cursor_iter(cursor, chunk_size, self.columns)
         if not chunked_fetch:
             # If using non-chunked reads, read data into memory.

django_mongodb_backend/creation.py

@@ -1,10 +1,6 @@
 from django.conf import settings
 from django.db.backends.base.creation import BaseDatabaseCreation
 
-from django_mongodb_backend.management.commands.createcachecollection import (
-    Command as CreateCacheCollection,
-)
-
 
 class DatabaseCreation(BaseDatabaseCreation):
     def _execute_create_test_db(self, cursor, parameters, keepdb=False):
@@ -20,12 +16,3 @@ def _destroy_test_db(self, test_database_name, verbosity):
         for collection in self.connection.introspection.table_names():
             if not collection.startswith("system."):
                 self.connection.database.drop_collection(collection)
-
-    def create_test_db(self, *args, **kwargs):
-        test_database_name = super().create_test_db(*args, **kwargs)
-        # Not using call_command() avoids the requirement to put
-        # "django_mongodb_backend" in INSTALLED_APPS.
-        CreateCacheCollection().handle(
-            database=self.connection.alias, verbosity=kwargs["verbosity"]
-        )
-        return test_database_name

django_mongodb_backend/functions.py

@@ -199,6 +199,9 @@ def trunc(self, compiler, connection):
     return {"$dateTrunc": lhs_mql}
 
 
+_trunc_convert_value = TruncBase.convert_value
+
+
 def trunc_convert_value(self, value, expression, connection):
     if connection.vendor == "mongodb":
         # A custom TruncBase.convert_value() for MongoDB.
@@ -223,7 +226,7 @@ def trunc_convert_value(self, value, expression, connection):
                 # Truncate for Trunc(..., output_field=TimeField)
                 value = value.time()
         return value
-    return self.convert_value(value, expression, connection)
+    return _trunc_convert_value(self, value, expression, connection)
 
 
 def trunc_date(self, compiler, connection):

django_mongodb_backend/operations.py

@@ -80,6 +80,8 @@ def adapt_timefield_value(self, value):
     def _get_arrayfield_converter(self, converter, *args, **kwargs):
         # Return a database converter that can be applied to a list of values.
         def convert_value(value, expression, connection):
+            if value is None:
+                return None
             return [converter(x, expression, connection) for x in value]
 
         return convert_value

docs/source/index.rst

@@ -49,11 +49,6 @@ Forms
 
 - :doc:`ref/forms`
 
-Core functionalities
-====================
-
-- :doc:`topics/cache`
-
 Miscellaneous
 =============
 

docs/source/ref/index.rst

@@ -7,5 +7,4 @@ API reference
 
    models/index
    forms
-   django-admin
    utils