Skip to content

Commit 8c118e6

Browse files
committed
Simplify handlers.
1 parent b194d31 commit 8c118e6

File tree

1 file changed

+5
-20
lines changed
  • django_mongodb_backend/fields

1 file changed

+5
-20
lines changed

django_mongodb_backend/fields/json.py

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ def key_transform(self, compiler, connection, as_path=False):
126126
return build_json_mql_path(lhs_mql, key_transforms, as_path=as_path)
127127

128128

129-
def key_transform_exact_expr(self, compiler, connection):
130-
return builtin_lookup_expr(self, compiler, connection)
131-
132-
133129
def key_transform_exact_path(self, compiler, connection):
134130
lhs_mql = process_lhs(self, compiler, connection, as_path=True)
135131
return {
@@ -157,10 +153,6 @@ def key_transform_in_expr(self, compiler, connection):
157153
return {"$and": [_has_key_predicate(lhs_mql, root_column), expr]}
158154

159155

160-
def key_transform_in_path(self, compiler, connection):
161-
return builtin_lookup_path(self, compiler, connection)
162-
163-
164156
def key_transform_is_null_expr(self, compiler, connection):
165157
"""
166158
Return MQL to check the nullability of a key.
@@ -201,10 +193,6 @@ def key_transform_numeric_lookup_mixin_expr(self, compiler, connection):
201193
return {"$and": [expr, not_missing_or_null]}
202194

203195

204-
def key_transform_numeric_lookup_mixin_path(self, compiler, connection):
205-
return builtin_lookup_path(self, compiler, connection)
206-
207-
208196
@property
209197
def keytransform_is_simple_column(self):
210198
previous = self
@@ -220,20 +208,17 @@ def register_json_field():
220208
DataContains.as_mql = data_contains
221209
HasAnyKeys.mongo_operator = "$or"
222210
HasKey.mongo_operator = None
223-
HasKeyLookup.as_mql_path = partialmethod(has_key_lookup, as_path=True)
224211
HasKeyLookup.as_mql_expr = partialmethod(has_key_lookup, as_path=False)
212+
HasKeyLookup.as_mql_path = partialmethod(has_key_lookup, as_path=True)
225213
HasKeyLookup.can_use_path = has_key_check_simple_expression
226214
HasKeys.mongo_operator = "$and"
227215
JSONExact.process_rhs = json_exact_process_rhs
228-
KeyTransform.is_simple_column = keytransform_is_simple_column
229-
KeyTransform.can_use_path = keytransform_is_simple_column
230-
KeyTransform.as_mql_path = partialmethod(key_transform, as_path=True)
231216
KeyTransform.as_mql_expr = partialmethod(key_transform, as_path=False)
232-
KeyTransformExact.as_mql_expr = key_transform_exact_expr
217+
KeyTransform.as_mql_path = partialmethod(key_transform, as_path=True)
218+
KeyTransform.can_use_path = keytransform_is_simple_column
219+
KeyTransform.is_simple_column = keytransform_is_simple_column
233220
KeyTransformExact.as_mql_path = key_transform_exact_path
234-
KeyTransformIn.as_mql_path = key_transform_in_path
235221
KeyTransformIn.as_mql_expr = key_transform_in_expr
236-
KeyTransformIsNull.as_mql_path = key_transform_is_null_path
237222
KeyTransformIsNull.as_mql_expr = key_transform_is_null_expr
238-
KeyTransformNumericLookupMixin.as_mql_path = key_transform_numeric_lookup_mixin_path
223+
KeyTransformIsNull.as_mql_path = key_transform_is_null_path
239224
KeyTransformNumericLookupMixin.as_mql_expr = key_transform_numeric_lookup_mixin_expr

0 commit comments

Comments
 (0)