Skip to content

Update JSON path compilation for Django version 6.0 #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caramdache wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Update JSON path compilation for Django version 6.0 #481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions mssql/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
if VERSION >= (3, 1):
from django.db.models.fields.json import (
KeyTransform, KeyTransformIn, KeyTransformExact,
HasKeyLookup, compile_json_path)

HasKeyLookup)
if VERSION >= (3, 1) and VERSION < (6, 0):
from django.db.models.fields.json import compile_json_path

if VERSION >= (3, 2):
from django.db.models.functions.math import Random

Expand Down Expand Up @@ -327,7 +329,10 @@ def _combine_conditions(conditions):
if isinstance(self.lhs, KeyTransform):
# If lhs is a KeyTransform, preprocess to get SQL and JSON path
lhs, _, lhs_key_transforms = self.lhs.preprocess_lhs(compiler, connection)
lhs_json_path = compile_json_path(lhs_key_transforms)
if VERSION >= (6, 0):
lhs_json_path = connection.ops.compile_json_path(lhs_key_transforms)
else:
lhs_json_path = compile_json_path(lhs_key_transforms)
lhs_params = []
else:
# Otherwise, process lhs normally and set default JSON path
Expand Down Expand Up @@ -355,7 +360,10 @@ def _combine_conditions(conditions):
if VERSION >= (4, 1):
# For Django 4.1+, split out the final key and build the JSON path accordingly
*rhs_key_transforms, final_key = rhs_key_transforms
rhs_json_path = compile_json_path(rhs_key_transforms, include_root=False)
if VERSION >= (6, 0):
rhs_json_path = connection.ops.compile_json_path(rhs_key_transforms, include_root=False)
else:
rhs_json_path = compile_json_path(rhs_key_transforms, include_root=False)
rhs_json_path += self.compile_json_path_final_key(final_key)
rhs_params.append(lhs_json_path + rhs_json_path)
else:
Expand Down