Update to Django 5.2

- Adapt SQLDeleteCompiler.execute_sql() per django/django@ddefc3f - Remove special-casing of DecimalField calling adapt_decimalfield_value() obsoleted by django/django@1860a1a - Add ExpressionList.as_mql() for django/django@d99985b

Author: timgraham

.evergreen/run-tests.sh

@@ -9,7 +9,7 @@ python -m pip install -U pip
 pip install -e .
 
 # Install django and test dependencies
-git clone --branch mongodb-5.1.x https://github.com/mongodb-forks/django django_repo
+git clone --branch mongodb-5.2.x https://github.com/mongodb-forks/django django_repo
 pushd django_repo/tests/
 pip install -e ..
 pip install -r requirements/py3.txt

.github/workflows/test-python.yml

@@ -33,7 +33,7 @@ jobs:
  uses: actions/checkout@v4
  with:
  repository: 'mongodb-forks/django'
- ref: 'mongodb-5.1.x'
+ ref: 'mongodb-5.2.x'
  path: 'django_repo'
  persist-credentials: false
  - name: Install system packages for Django's Python test dependencies

README.md

@@ -16,9 +16,9 @@ https://django-mongodb-backend.readthedocs.io/en/latest/.
 ## Install
 
 Use the version of `django-mongodb-backend` that corresponds to your version of
-Django. For example, to get the latest compatible release for Django 5.1.x:
+Django. For example, to get the latest compatible release for Django 5.2.x:
 ```bash
-pip install --pre django-mongodb-backend==5.1.*
+pip install --pre django-mongodb-backend==5.2.*
 ```
 (Until the package is out of beta, you must use pip's `--pre` option.)
 
@@ -36,11 +36,11 @@ You can check what version of Django you're using with:
 django-admin --version
 ```
 
-The snippet below specifies `5.1.x.zip` at the end of
-the template url to get the template for any Django version matching 5.1:
+The snippet below specifies `5.2.x.zip` at the end of
+the template url to get the template for any Django version matching 5.2:
 
 ```bash
-django-admin startproject example --template https://github.com/mongodb-labs/django-mongodb-project/archive/refs/heads/5.1.x.zip
+django-admin startproject example --template https://github.com/mongodb-labs/django-mongodb-project/archive/refs/heads/5.2.x.zip
 ```
 
 

django_mongodb_backend/__init__.py

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

django_mongodb_backend/compiler.py

@@ -17,7 +17,6 @@
 from django.utils.functional import cached_property
 from pymongo import ASCENDING, DESCENDING
 
-from .base import Cursor
 from .query import MongoQuery, wrap_database_errors
 
 
@@ -690,15 +689,12 @@ def collection_name(self):
 
 class SQLDeleteCompiler(compiler.SQLDeleteCompiler, SQLCompiler):
  def execute_sql(self, result_type=MULTI):
- cursor = Cursor()
  try:
  query = self.build_query()
  except EmptyResultSet:
- rowcount = 0
+ return 0
  else:
- rowcount = query.delete()
- cursor.rowcount = rowcount
- return cursor
+ return query.delete()
 
  def check_query(self):
  super().check_query()

django_mongodb_backend/expressions.py

@@ -10,6 +10,7 @@
  Col,
  CombinedExpression,
  Exists,
+ ExpressionList,
  ExpressionWrapper,
  F,
  NegatedExpression,
@@ -24,6 +25,8 @@
 )
 from django.db.models.sql import Query
 
+from .query_utils import process_lhs
+
 
 def case(self, compiler, connection):
  case_parts = []
@@ -202,6 +205,7 @@ def register_expressions():
  Col.as_mql = col
  CombinedExpression.as_mql = combined_expression
  Exists.as_mql = exists
+ ExpressionList.as_mql = process_lhs
  ExpressionWrapper.as_mql = expression_wrapper
  F.as_mql = f
  NegatedExpression.as_mql = negated_expression

django_mongodb_backend/features.py

@@ -88,6 +88,34 @@ class DatabaseFeatures(BaseDatabaseFeatures):
  # of $setIsSubset must be arrays. Second argument is of type: null"
  # https://jira.mongodb.org/browse/SERVER-99186
  "model_fields_.test_arrayfield.QueryingTests.test_contained_by_subquery",
+ # Broken by https://github.com/django/django/commit/65ad4ade74dc9208b9d686a451cd6045df0c9c3a
+ "aggregation.tests.AggregateTestCase.test_even_more_aggregate",
+ "aggregation.tests.AggregateTestCase.test_grouped_annotation_in_group_by",
+ "aggregation.tests.AggregateTestCase.test_non_grouped_annotation_not_in_group_by",
+ "aggregation_regress.tests.AggregationTests.test_aggregate_fexpr",
+ "aggregation_regress.tests.AggregationTests.test_values_list_annotation_args_ordering",
+ "annotations.tests.NonAggregateAnnotationTestCase.test_annotation_subquery_and_aggregate_values_chaining",
+ "annotations.tests.NonAggregateAnnotationTestCase.test_values_fields_annotations_order",
+ "queries.test_qs_combinators.QuerySetSetOperationTests.test_union_multiple_models_with_values_and_datetime_annotations",
+ "queries.test_qs_combinators.QuerySetSetOperationTests.test_union_multiple_models_with_values_list_and_datetime_annotations",
+ "queries.test_qs_combinators.QuerySetSetOperationTests.test_union_multiple_models_with_values_list_and_annotations",
+ "queries.test_qs_combinators.QuerySetSetOperationTests.test_union_with_field_and_annotation_values",
+ "queries.test_qs_combinators.QuerySetSetOperationTests.test_union_with_two_annotated_values_list",
+ "queries.tests.Queries1Tests.test_union_values_subquery",
+ # JSONArray not implemented.
+ "db_functions.json.test_json_array.JSONArrayTests",
+ # Some usage of prefetch_related() raises "ColPairs is not supported."
+ "known_related_objects.tests.ExistingRelatedInstancesTests.test_one_to_one_multi_prefetch_related",
+ "known_related_objects.tests.ExistingRelatedInstancesTests.test_one_to_one_prefetch_related",
+ "prefetch_related.tests.DeprecationTests.test_prefetch_one_level_fallback",
+ "prefetch_related.tests.MultiDbTests.test_using_is_honored_fkey",
+ "prefetch_related.tests.MultiDbTests.test_using_is_honored_inheritance",
+ "prefetch_related.tests.NestedPrefetchTests.test_nested_prefetch_is_not_overwritten_by_related_object",
+ "prefetch_related.tests.NullableTest.test_prefetch_nullable",
+ "prefetch_related.tests.Ticket19607Tests.test_bug",
+ # Value.as_mql() doesn't call output_field.get_db_prep_save():
+ # https://github.com/mongodb/django-mongodb-backend/issues/282
+ "model_fields.test_jsonfield.TestSaveLoad.test_bulk_update_custom_get_prep_value",
  }
  # $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3.
  _django_test_expected_failures_bitwise = {
@@ -112,6 +140,7 @@ def django_test_expected_failures(self):
  # bson.errors.InvalidDocument: cannot encode object:
  # <django.db.models.expressions.DatabaseDefault
  "basic.tests.ModelInstanceCreationTests.test_save_primary_with_db_default",
+ "basic.tests.ModelInstanceCreationTests.test_save_primary_with_falsey_db_default",
  "constraints.tests.UniqueConstraintTests.test_database_default",
  "field_defaults.tests.DefaultTests",
  "migrations.test_operations.OperationTests.test_add_field_both_defaults",
@@ -194,9 +223,13 @@ def django_test_expected_failures(self):
  "prefetch_related.tests.Ticket21410Tests",
  "queryset_pickle.tests.PickleabilityTestCase.test_pickle_prefetch_related_with_m2m_and_objects_deletion",
  "serializers.test_json.JsonSerializerTestCase.test_serialize_prefetch_related_m2m",
+ "serializers.test_json.JsonSerializerTestCase.test_serialize_prefetch_related_m2m_with_natural_keys",
  "serializers.test_jsonl.JsonlSerializerTestCase.test_serialize_prefetch_related_m2m",
+ "serializers.test_jsonl.JsonlSerializerTestCase.test_serialize_prefetch_related_m2m_with_natural_keys",
  "serializers.test_xml.XmlSerializerTestCase.test_serialize_prefetch_related_m2m",
+ "serializers.test_xml.XmlSerializerTestCase.test_serialize_prefetch_related_m2m_with_natural_keys",
  "serializers.test_yaml.YamlSerializerTestCase.test_serialize_prefetch_related_m2m",
+ "serializers.test_yaml.YamlSerializerTestCase.test_serialize_prefetch_related_m2m_with_natural_keys",
  },
  "AutoField not supported.": {
  "bulk_create.tests.BulkCreateTests.test_bulk_insert_nullable_fields",
@@ -599,6 +632,13 @@ def django_test_expected_failures(self):
  "foreign_object.tests.MultiColumnFKTests",
  "foreign_object.tests.TestExtraJoinFilterQ",
  },
+ "Tuple lookups are not supported.": {
+ "foreign_object.test_tuple_lookups.TupleLookupsTests",
+ },
+ "ColPairs is not supported.": {
+ # 'ColPairs' object has no attribute 'as_mql'
+ "auth_tests.test_views.CustomUserCompositePrimaryKeyPasswordResetTest",
+ },
  "Custom lookups are not supported.": {
  "custom_lookups.tests.BilateralTransformTests",
  "custom_lookups.tests.LookupTests.test_basic_lookup",

django_mongodb_backend/fields/array.py

@@ -1,7 +1,7 @@
 import json
 
 from django.core import checks, exceptions
-from django.db.models import DecimalField, Field, Func, IntegerField, Transform, Value
+from django.db.models import Field, Func, IntegerField, Transform, Value
 from django.db.models.fields.mixins import CheckFieldDefaultMixin
 from django.db.models.lookups import Exact, FieldGetDbPrepValueMixin, In, Lookup
 from django.utils.translation import gettext_lazy as _
@@ -127,10 +127,6 @@ def db_type(self, connection):
 
  def get_db_prep_value(self, value, connection, prepared=False):
  if isinstance(value, list | tuple):
- # Workaround for https://code.djangoproject.com/ticket/35982
- # (fixed in Django 5.2).
- if isinstance(self.base_field, DecimalField):
- return [self.base_field.get_db_prep_save(i, connection) for i in value]
  return [self.base_field.get_db_prep_value(i, connection, prepared=False) for i in value]
  return value
 

django_mongodb_backend/lookups.py

@@ -1,5 +1,6 @@
 from django.db import NotSupportedError
-from django.db.models.fields.related_lookups import In, MultiColSource, RelatedIn
+from django.db.models.expressions import ColPairs
+from django.db.models.fields.related_lookups import In, RelatedIn
 from django.db.models.lookups import (
  BuiltinLookup,
  FieldGetDbPrepValueIterableMixin,
@@ -34,8 +35,8 @@ def field_resolve_expression_parameter(self, compiler, connection, sql, param):
 
 
 def in_(self, compiler, connection):
- if isinstance(self.lhs, MultiColSource):
- raise NotImplementedError("MultiColSource is not supported.")
+ if isinstance(self.lhs, ColPairs):
+ raise NotImplementedError("ColPairs is not supported.")
  db_rhs = getattr(self.rhs, "_db", None)
  if db_rhs is not None and db_rhs != connection.alias:
  raise ValueError(

django_mongodb_backend/operations.py

@@ -195,28 +195,6 @@ def execute_sql_flush(self, tables):
  if not options.get("capped", False):
  collection.delete_many({})
 
- def prep_lookup_value(self, value, field, lookup):
- """
- Perform type-conversion on `value` before using as a filter parameter.
- """
- if getattr(field, "rel", None) is not None:
- field = field.rel.get_related_field()
- field_kind = field.get_internal_type()
-
- if lookup in ("in", "range"):
- return [
- self._prep_lookup_value(subvalue, field, field_kind, lookup) for subvalue in value
- ]
- return self._prep_lookup_value(value, field, field_kind, lookup)
-
- def _prep_lookup_value(self, value, field, field_kind, lookup):
- if value is None:
- return None
-
- if field_kind == "DecimalField":
- value = self.adapt_decimalfield_value(value, field.max_digits, field.decimal_places)
- return value
-
  def explain_query_prefix(self, format=None, **options):
  # Validate options.
  validated_options = {}