INTPYTHON-348 Add support for QuerySet.raw()

- Tim tips

Author: aclark4life

django_mongodb/compiler.py

@@ -630,20 +630,6 @@ def explain_query(self):
             result.append(f"{key}: {formatted_value}")
         return result
 
-    def apply_converters(self, rows, converters):
-        connection = self.connection
-        converters = list(converters.items())
-        for row in rows:
-            for pos, (convs, expression) in converters:
-                try:
-                    value = list(row.values())[pos]
-                except AttributeError:
-                    value = row[pos]
-                for converter in convs:
-                    value = converter(value, expression, connection)
-                row[pos] = value
-            yield row
-
 
 class SQLInsertCompiler(SQLCompiler):
     def execute_sql(self, returning_fields=None):

django_mongodb/features.py

@@ -88,7 +88,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "contenttypes_tests.test_fields.GenericRelationTests.test_value_to_string",
         # INTPYTHON-348 add support for QuerySet.raw_mql()
         # https://github.com/mongodb-labs/django-mongodb/pull/183
-        "raw_query.tests.RawQueryTests",
+        # "raw_query.tests.RawQueryTests",
     }
     # $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3.
     _django_test_expected_failures_bitwise = {

django_mongodb/query.py

@@ -341,8 +341,7 @@ def _execute_query(self):
     def get_columns(self):
         if self.cursor is None:
             self._execute_query()
-        converter = connections[self.using].introspection.identifier_converter
-        return [converter(column_name) for column_name in self.model._meta.fields]
+        return [f.column for f in self.model._meta.fields]
 
     def __str__(self):
         return "%s" % self.sql
@@ -364,20 +363,6 @@ def __init__(
             sql=raw_query, using=self.db, model=self.model, params=params
         )
 
-    def resolve_model_init_order(self):
-        converter = connections[self.db].introspection.identifier_converter
-        model_init_fields = [
-            f for f in self.model._meta.fields if f.column in [j.column for j in self.columns]
-        ]
-        annotation_fields = [
-            (column, pos)
-            for pos, column in enumerate(self.columns)
-            if column not in self.model_fields
-        ]
-        model_init_order = [self.columns.index(converter(f)) for f in model_init_fields]
-        model_init_names = [f.attname for f in model_init_fields]
-        return model_init_names, model_init_order, annotation_fields
-
     def iterator(self):
         yield from MongoRawModelIterable(self)
 
@@ -397,7 +382,7 @@ def __iter__(self):
                 annotation_fields,
             ) = self.queryset.resolve_model_init_order()
             model_cls = self.queryset.model
-            fields = [self.queryset.model_fields.get(c.column) for c in self.queryset.columns]
+            fields = [self.queryset.model_fields.get(c) for c in self.queryset.columns]
             converters = compiler.get_converters(
                 [f.get_col(f.model._meta.db_table) if f else None for f in fields]
             )