diff options
| author | sage <laymonage@gmail.com> | 2020-12-07 16:14:27 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 10:14:27 +0100 |
| commit | e23484484c98fa55f501f6dda6423c6616898f27 (patch) | |
| tree | 084f410c3ffadbc99d912e44fe5ea51d3b35589b | |
| parent | 406eb43112055b16a1ec5018fc454969dc192773 (diff) | |
Removed lhs_only argument from KeyTransform.preprocess_lhs().
| -rw-r--r-- | django/db/models/fields/json.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/django/db/models/fields/json.py b/django/db/models/fields/json.py index 340b7ee875..29c6ff0926 100644 --- a/django/db/models/fields/json.py +++ b/django/db/models/fields/json.py @@ -276,19 +276,17 @@ class KeyTransform(Transform): super().__init__(*args, **kwargs) self.key_name = str(key_name) - def preprocess_lhs(self, compiler, connection, lhs_only=False): - if not lhs_only: - key_transforms = [self.key_name] + def preprocess_lhs(self, compiler, connection): + key_transforms = [self.key_name] previous = self.lhs 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 lhs, params = compiler.compile(previous) if connection.vendor == 'oracle': # Escape string-formatting. 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): lhs, params, key_transforms = self.preprocess_lhs(compiler, connection) @@ -407,7 +405,7 @@ class KeyTransformExact(JSONExact): if connection.vendor == 'sqlite': rhs, rhs_params = super().process_rhs(compiler, connection) 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 return lhs, lhs_params |