INTPYTHON-348 Update raw_query tests for raw_mql

tests/raw_query/models.py

@@ -1,8 +1,10 @@
 from django.db import models
 from django_mongodb.manager import MongoManager
+from django_mongodb.fields import ObjectIdAutoField
 
 
 class Author(models.Model):
+    id = ObjectIdAutoField(primary_key=True)
     first_name = models.CharField(max_length=255)
     last_name = models.CharField(max_length=255)
     dob = models.DateField()
@@ -20,6 +22,7 @@ def __init__(self, *args, **kwargs):
 
 
 class Book(models.Model):
+    id = ObjectIdAutoField(primary_key=True)
     title = models.CharField(max_length=255)
     author = models.ForeignKey(Author, models.CASCADE)
     paperback = models.BooleanField(default=False)
@@ -35,17 +38,20 @@ class BookFkAsPk(models.Model):
 
 
 class Coffee(models.Model):
+    id = ObjectIdAutoField(primary_key=True)
     brand = models.CharField(max_length=255, db_column="name")
     price = models.DecimalField(max_digits=10, decimal_places=2, default=0)
     objects = MongoManager()
 
 
 class MixedCaseIDColumn(models.Model):
-    id = models.AutoField(primary_key=True, db_column="MiXeD_CaSe_Id")
+    # id = models.AutoField(primary_key=True,
+    id = ObjectIdAutoField(primary_key=True, db_column="MiXeD_CaSe_Id")
     objects = MongoManager()
 
 
 class Reviewer(models.Model):
+    id = ObjectIdAutoField(primary_key=True)
     reviewed = models.ManyToManyField(Book)
     objects = MongoManager()
 

tests/raw_query/tests.py

@@ -145,7 +145,7 @@ def test_raw_query_lazy(self):
         Raw queries are lazy: they aren't actually executed until they're
         iterated over.
         """
-        q = Author.objects.raw_mql("SELECT * FROM raw_query_author")
+        q = Author.objects.raw_mql([])
         self.assertIsNone(q.query.cursor)
         list(q)
         self.assertIsNotNone(q.query.cursor)