Ticket #12806: 12806.patch

django/db/models/sql/query.py

@@ -53 +53 @@
 
     def __iter__(self):
         # Always execute a new query for a new iterator.
-        # This could be optomized with a cache at the expense of RAM.
+        # This could be optimized with a cache at the expense of RAM.
         self._execute_query()
         return iter(self.cursor)
 

django/db/models/query.py

@@ -1334 +1334 @@
     def __repr__(self):
         return "<RawQuerySet: %r>" % (self.raw_query % self.params)
 
+    def __getitem__(self, k):
+        return list(self)[k]
+
     @property
     def db(self):
         "Return the database that will be used if this query is executed now"

tests/modeltests/raw_query/tests.py

@@ -185 +185 @@
             self.assertEqual(normal_authors[index], raw_author)
             second_iterations += 1
 
-        self.assertEqual(first_iterations, second_iterations)
- No newline at end of file
+        self.assertEqual(first_iterations, second_iterations)
+
+    def testGetItem(self):
+        # Indexing on RawQuerySets
+        query = "SELECT * FROM raw_query_author ORDER BY id ASC"
+        third_author = Author.objects.raw(query)[2]
+        self.assertEqual(third_author.first_name, 'Bob')
+
+        first_two = Author.objects.raw(query)[0:2]
+        self.assertEquals(len(first_two), 2)
+
+        try:
+            Author.objects.raw(query)['test']
+            self.fail('Index lookups should only accept int, long or slice')
+        except TypeError:
+            pass

AUTHORS

@@ -501 +501 @@
     Cheng Zhang
     Glenn Maynard <glenn@zewt.org>
     bthomas
+    Bruno Renié <buburno@gmail.com>
 
 A big THANK YOU goes to:
 

docs/topics/db/sql.txt

@@ -91 +91 @@
     >>> name_map = {'first': 'first_name', 'last': 'last_name', 'bd': 'birth_date', 'pk': 'id'}
     >>> Person.objects.raw('SELECT * FROM some_other_table', translations=name_map)
 
+Index lookups
+-------------
+
+``raw()`` supports indexing, so if you need only the first result you can
+write::
+
+    >>> first_person = Person.objects.raw('SELECT * from myapp_person')[0]
+
+However, the indexing and slicing are not performed at the database level. If
+you have a big amount of ``Person`` objects in your database, it would be more
+efficient to limit the query at the SQL level::
+
+    >>> first_person = Person.objects.raw('SELECT * from myapp_person LIMIT 1')[0]
+
 Deferring model fields
 ----------------------