Refactor: move builtin_lookup_idx to indexes.

Author: WaVEV

django_mongodb/indexes.py

@@ -1,9 +1,13 @@
 from django.core.exceptions import EmptyResultSet, FullResultSet
 from django.db import NotSupportedError
 from django.db.models import Index
+from django.db.models.expressions import Col
+from django.db.models.lookups import BuiltinLookup
 from django.db.models.sql.query import Query
 from django.db.models.sql.where import AND, XOR, WhereNode
 
+from .query_utils import process_rhs
+
 
 def _get_condition_mql(self, model, schema_editor):
     """Analogous to Index._get_condition_sql()."""
@@ -13,6 +17,14 @@ def _get_condition_mql(self, model, schema_editor):
     return where.as_mql_idx(compiler, schema_editor.connection)
 
 
+def builtin_lookup_idx(self, compiler, connection):
+    if not isinstance(self.lhs, Col):
+        raise NotSupportedError("Expressions as indexes are not supported.")
+    lhs_mql = self.lhs.target.column
+    value = process_rhs(self, compiler, connection)
+    return connection.mongo_operators_idx[self.lookup_name](lhs_mql, value)
+
+
 def where_node_idx(self, compiler, connection):
     if self.connector == AND:
         full_needed, empty_needed = len(self.children), 1
@@ -57,5 +69,6 @@ def where_node_idx(self, compiler, connection):
 
 
 def register_indexes():
+    BuiltinLookup.as_mql_idx = builtin_lookup_idx
     Index._get_condition_mql = _get_condition_mql
     WhereNode.as_mql_idx = where_node_idx

django_mongodb/lookups.py

@@ -1,5 +1,4 @@
 from django.db import NotSupportedError
-from django.db.models.expressions import Col
 from django.db.models.fields.related_lookups import In, MultiColSource, RelatedIn
 from django.db.models.lookups import (
     BuiltinLookup,
@@ -18,14 +17,6 @@ def builtin_lookup(self, compiler, connection):
     return connection.mongo_operators[self.lookup_name](lhs_mql, value)
 
 
-def builtin_lookup_idx(self, compiler, connection):
-    if not isinstance(self.lhs, Col):
-        raise NotSupportedError("Expressions as indexes are not supported.")
-    lhs_mql = self.lhs.target.column
-    value = process_rhs(self, compiler, connection)
-    return connection.mongo_operators_idx[self.lookup_name](lhs_mql, value)
-
-
 _field_resolve_expression_parameter = FieldGetDbPrepValueIterableMixin.resolve_expression_parameter
 
 
@@ -102,7 +93,6 @@ def uuid_text_mixin(self, compiler, connection):  # noqa: ARG001
 
 def register_lookups():
     BuiltinLookup.as_mql = builtin_lookup
-    BuiltinLookup.as_mql_idx = builtin_lookup_idx
     FieldGetDbPrepValueIterableMixin.resolve_expression_parameter = (
         field_resolve_expression_parameter
     )