Skip to content

Commit cbe6669

Browse files
committed
update to Django 5.1
1 parent 143079b commit cbe6669

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

.github/workflows/test-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/checkout@v4
4848
with:
4949
repository: 'mongodb-forks/django'
50-
ref: 'mongodb-5.0.x'
50+
ref: 'mongodb-5.1.x'
5151
path: 'django_repo'
5252
- name: Install system packages for Django's Python test dependencies
5353
run: |

django_mongodb/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "5.0a0"
1+
__version__ = "5.1a0"
22

33
# Check Django compatibility before other imports which may fail if the
44
# wrong version of Django is installed.

django_mongodb/features.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ class DatabaseFeatures(BaseDatabaseFeatures):
2626
uses_savepoints = False
2727

2828
_django_test_expected_failures = {
29+
# $concat only supports strings, not int
30+
"db_functions.text.test_concat.ConcatTests.test_concat_non_str",
2931
# Database defaults not supported: bson.errors.InvalidDocument:
3032
# cannot encode object: <django.db.models.expressions.DatabaseDefault
3133
"basic.tests.ModelInstanceCreationTests.test_save_primary_with_db_default",
@@ -51,7 +53,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
5153
# Length of null considered zero rather than null.
5254
"db_functions.text.test_length.LengthTests.test_basic",
5355
# range lookup includes incorrect values.
54-
"expressions.tests.IterableLookupInnerExpressionsTests.test_expressions_in_lookups_join_choice",
56+
"expressions.tests.IterableLookupInnerExpressionsTests.test_expressions_range_lookups_join_choice",
5557
# Unexpected alias_refcount in alias_map.
5658
"queries.tests.Queries1Tests.test_order_by_tables",
5759
# The $sum aggregation returns 0 instead of None for null.
@@ -120,6 +122,8 @@ def django_test_expected_failures(self):
120122
"expressions.tests.BasicExpressionsTests.test_object_update_unsaved_objects",
121123
"expressions.tests.BasicExpressionsTests.test_order_of_operations",
122124
"expressions.tests.BasicExpressionsTests.test_parenthesis_priority",
125+
"expressions.tests.BasicExpressionsTests.test_slicing_of_f_expressions_charfield",
126+
"expressions.tests.BasicExpressionsTests.test_slicing_of_f_expressions_textfield",
123127
"expressions.tests.BasicExpressionsTests.test_update",
124128
"expressions.tests.BasicExpressionsTests.test_update_with_fk",
125129
"expressions.tests.BasicExpressionsTests.test_update_with_none",
@@ -216,6 +220,7 @@ def django_test_expected_failures(self):
216220
"expressions.tests.BasicExpressionsTests.test_case_in_filter_if_boolean_output_field",
217221
"expressions.tests.BasicExpressionsTests.test_exists_in_filter",
218222
"expressions.tests.BasicExpressionsTests.test_order_by_exists",
223+
"expressions.tests.BasicExpressionsTests.test_slicing_of_outerref",
219224
"expressions.tests.BasicExpressionsTests.test_subquery",
220225
"expressions.tests.ExistsTests.test_filter_by_empty_exists",
221226
"expressions.tests.ExistsTests.test_negated_empty_exists",
@@ -315,6 +320,7 @@ def django_test_expected_failures(self):
315320
"queries.tests.EmptyQuerySetTests.test_values_subquery",
316321
"queries.tests.ExcludeTests.test_exclude_subquery",
317322
"queries.tests.NullInExcludeTest.test_null_in_exclude_qs",
323+
"queries.tests.Queries1Tests.test_combining_does_not_mutate",
318324
"queries.tests.Queries1Tests.test_ticket9985",
319325
"queries.tests.Queries1Tests.test_ticket9997",
320326
"queries.tests.Queries1Tests.test_ticket10742",
@@ -424,6 +430,7 @@ def django_test_expected_failures(self):
424430
"aggregation.tests.AggregateTestCase.test_count_star",
425431
"delete.tests.DeletionTests.test_only_referenced_fields_selected",
426432
"lookup.tests.LookupTests.test_in_ignore_none",
433+
"lookup.tests.LookupTests.test_lookup_direct_value_rhs_unwrapped",
427434
"lookup.tests.LookupTests.test_textfield_exact_null",
428435
"queries.tests.ExistsSql.test_exists",
429436
"queries.tests.Queries6Tests.test_col_alias_quoted",

django_mongodb/query_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ def process_lhs(node, compiler, connection):
1212
# node is a Func or Expression, possibly with multiple source expressions.
1313
result = []
1414
for expr in node.get_source_expressions():
15+
if expr is None:
16+
continue
1517
try:
1618
result.append(expr.as_mql(compiler, connection))
1719
except FullResultSet:

0 commit comments

Comments
 (0)