Clean up.

Author: WaVEV

django_mongodb/__init__.py

@@ -6,14 +6,12 @@
 
 check_django_compatability()
 
-from .datastructures import register_datastructures  # noqa: E402
 from .expressions import register_expressions  # noqa: E402
 from .fields import register_fields  # noqa: E402
 from .functions import register_functions  # noqa: E402
 from .lookups import register_lookups  # noqa: E402
 from .query import register_nodes  # noqa: E402
 
-register_datastructures()
 register_expressions()
 register_fields()
 register_functions()

django_mongodb/compiler.py

@@ -73,12 +73,6 @@ def _make_result(self, entity, columns):
         The entity is assumed to be a dict using field database column
         names as keys.
         """
-        result = self._apply_converters(entity, columns, converters)
-        if tuple_expected:
-            result = tuple(result)
-        return result
-
-    def _apply_converters(self, entity, columns, converters):
         result = []
         for name, col in columns:
             column_alias = getattr(col, "alias", None)
@@ -141,6 +135,7 @@ def get_count(self, check_exists=False):
     def build_query(self, columns=None):
         """Check if the query is supported and prepare a MongoQuery."""
         self.check_query()
+        self.setup_query()
         query = self.query_class(self, columns)
         query.lookup_pipeline = self.get_lookup_pipeline()
         try:

django_mongodb/datastructures.py

@@ -8,7 +8,7 @@
 from django.conf import settings
 from django.db import DataError
 from django.db.backends.base.operations import BaseDatabaseOperations
-from django.db.models.expressions import Col, Combinable
+from django.db.models.expressions import Combinable
 from django.utils import timezone
 from django.utils.regex_helper import _lazy_re_compile
 
@@ -176,12 +176,6 @@ def execute_sql_flush(self, tables):
             if not options.get("capped", False):
                 collection.drop()
 
-    def prepare_join_on_clause(self, lhs_table, lhs_field, rhs_table, rhs_field):
-        lhs_expr = Col(lhs_table, lhs_field)
-        rhs_expr = Col(rhs_table, rhs_field)
-
-        return lhs_expr, rhs_expr
-
     def prep_lookup_value(self, value, field, lookup):
         """
         Perform type-conversion on `value` before using as a filter parameter.

django_mongodb/operations.py

@@ -45,7 +45,6 @@ def __init__(self, compiler, columns):
         self.columns = columns
         self._negated = False
         self.ordering = []
-        self.collection_name = self.compiler.collection_name
         self.collection = self.compiler.get_collection()
         self.collection_name = self.compiler.collection_name
         self.mongo_query = getattr(compiler.query, "raw_query", {})
@@ -124,13 +123,6 @@ def get_cursor(self):
         pipeline = []
         if self.lookup_pipeline:
             pipeline.extend(self.lookup_pipeline)
-
-        # Add the subquery results if fields is defined.
-        if fields:
-            for alias in self.query.alias_map:
-                if self.query.alias_refcount[alias] and self.collection_name != alias:
-                    fields[alias] = 1
-
         if self.mongo_query:
             pipeline.append({"$match": self.mongo_query})
         if fields: