innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Removed lhs_only argument from KeyTransform.preprocess_lhs().

This commit is contained in:
sage 2020-12-07 16:14:27 +07:00 committed by GitHub
parent 406eb43112
commit e23484484c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/db/models/fields/json.py
View File

@ -276,19 +276,17 @@ class KeyTransform(Transform):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.key_name = str(key_name) self.key_name = str(key_name)
def preprocess_lhs(self, compiler, connection, lhs_only=False): def preprocess_lhs(self, compiler, connection):
if not lhs_only: key_transforms = [self.key_name]
key_transforms = [self.key_name]
previous = self.lhs previous = self.lhs
while isinstance(previous, KeyTransform): while isinstance(previous, KeyTransform):
if not lhs_only: key_transforms.insert(0, previous.key_name)
key_transforms.insert(0, previous.key_name)
previous = previous.lhs previous = previous.lhs
lhs, params = compiler.compile(previous) lhs, params = compiler.compile(previous)
if connection.vendor == 'oracle': if connection.vendor == 'oracle':
# Escape string-formatting. # Escape string-formatting.
key_transforms = [key.replace('%', '%%') for key in key_transforms] key_transforms = [key.replace('%', '%%') for key in key_transforms]
return (lhs, params, key_transforms) if not lhs_only else (lhs, params) return lhs, params, key_transforms
def as_mysql(self, compiler, connection): def as_mysql(self, compiler, connection):
lhs, params, key_transforms = self.preprocess_lhs(compiler, connection) lhs, params, key_transforms = self.preprocess_lhs(compiler, connection)
@ -407,7 +405,7 @@ class KeyTransformExact(JSONExact):
if connection.vendor == 'sqlite': if connection.vendor == 'sqlite':
rhs, rhs_params = super().process_rhs(compiler, connection) rhs, rhs_params = super().process_rhs(compiler, connection)
if rhs == '%s' and rhs_params == ['null']: if rhs == '%s' and rhs_params == ['null']:
lhs, _ = self.lhs.preprocess_lhs(compiler, connection, lhs_only=True) lhs, *_ = self.lhs.preprocess_lhs(compiler, connection)
lhs = 'JSON_TYPE(%s, %%s)' % lhs lhs = 'JSON_TYPE(%s, %%s)' % lhs
return lhs, lhs_params return lhs, lhs_params