Clean up.

Author: WaVEV

django_mongodb/compiler.py

@@ -96,15 +96,15 @@ def _make_result(self, entity, columns, related_columns, converters, tuple_expec
         The entity is assumed to be a dict using field database column
         names as keys.
         """
-        result = self._project_result(entity, columns, converters, tuple_expected)
-        # Related columns
+        result = self._apply_converters(entity, columns, converters)
+        # Related columns.
         for relation, columns in related_columns:
-            result += self._project_result(entity[relation], columns, converters, tuple_expected)
+            result += self._apply_converters(entity[relation], columns, converters)
         if tuple_expected:
             result = tuple(result)
         return result
 
-    def _project_result(self, entity, columns, converters, tuple_expected=False):
+    def _apply_converters(self, entity, columns, converters):
         result = []
         for name, col in columns:
             field = col.field
@@ -255,18 +255,6 @@ def get_lookup_clauses(self):
             clause_mql = from_clause.as_mql(self, self.connection)
             result += clause_mql
 
-        """
-        for t in self.query.extra_tables:
-            alias, _ = self.query.table_alias(t)
-            # Only add the alias if it's not already present (the table_alias()
-            # call increments the refcount, so an alias refcount of one means
-            # this is the only reference).
-            if (
-                alias not in self.query.alias_map
-                or self.query.alias_refcount[alias] == 1
-            ):
-                result.append(", %s" % self.quote_name_unless_alias(alias))
-        """
         return result
 
 

django_mongodb/datastructures.py

@@ -23,7 +23,6 @@ def join(self, compiler, connection):
         lhs_fields.append(lhs_mql)
         rhs_fields.append(rhs_mql)
 
-    # temp_table_name = f"{self.table_alias}__array"
     parent_template = "parent__field__"
     lookups_pipeline = [
         {

django_mongodb/query.py

@@ -112,12 +112,11 @@ def get_cursor(self):
                 # another column.
                 fields[name] = 1 if name == column else f"${column}"
 
-        # add the subquery tables. if fields is defined
-        related_fields = {}
+        # Add the subquery results if fields is defined.
         if fields:
             for alias in self.query.alias_map:
-                if self.query.alias_refcount[alias] > 0 and self.collection_name != alias:
-                    related_fields[alias] = 1
+                if self.query.alias_refcount[alias] and self.collection_name != alias:
+                    fields[alias] = 1
 
         pipeline = []
         if self.mongo_lookups:
@@ -126,7 +125,7 @@ def get_cursor(self):
         if self.mongo_query:
             pipeline.append({"$match": self.mongo_query})
         if fields:
-            pipeline.append({"$project": {**fields, **related_fields}})
+            pipeline.append({"$project": fields})
         if self.ordering:
             pipeline.append({"$sort": dict(self.ordering)})
         if self.query.low_mark > 0: