Ticket #6807: iterator_sentinel.patch

django/db/models/sql/query.py

@@ -1330 +1330 @@
-        if result_type == SINGLE:
-            return cursor.fetchone()
-        # The MULTI case.
+        if self.connection.features.uses_tuple_iterator_sentinel:
+            return iter((lambda: cursor.fetchmany(GET_ITERATOR_CHUNK_SIZE)), ())
-        return iter((lambda: cursor.fetchmany(GET_ITERATOR_CHUNK_SIZE)), [])
-
-def get_order_dir(field, default='ASC'):

django/db/backends/mysql/base.py

@@ -61 +61 @@
-class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
-    inline_fk_references = False
+    uses_tuple_iterator_sentinel = True
-
-class DatabaseOperations(BaseDatabaseOperations):
-    def date_extract_sql(self, lookup_type, field_name):
@@ -127 +128 @@
-            return sql
-        else:
-            return []
-
+
-class DatabaseWrapper(BaseDatabaseWrapper):
-    features = DatabaseFeatures()
-    ops = DatabaseOperations()

django/db/backends/__init__.py

@@ -50 +50 @@
-    supports_tablespaces = False
-    uses_case_insensitive_names = False
-    uses_custom_queryset = False
+    uses_tuple_iterator_sentinel = False
-
-class BaseDatabaseOperations(object):
-    """
@@ -126 +127 @@
-        contain a '%s' placeholder for the value being searched against.
-        """
-        raise NotImplementedError('Full-text search is not implemented for this database backend')
-
+
-    def last_executed_query(self, cursor, sql, params):
-        """
-        Returns a string of the query last executed by the given cursor, with