Ticket #11003: with-hints-13402.diff

django/db/models/sql/compiler.py

@@ -441 +441 @@
                 continue
             alias_str = (alias != name and ' %s' % alias or '')
             if join_type and not first:
-                result.append('%s %s%s ON (%s.%s = %s.%s)'
+                part ='%s %s%s ON (%s.%s = %s.%s)' \
                         % (join_type, qn(name), alias_str, qn(lhs),
-                           qn2(lhs_col), qn(alias), qn2(col)))
+                           qn2(lhs_col), qn(alias), qn2(col))
             else:
                 connector = not first and ', ' or ''
-                result.append('%s%s%s' % (connector, qn(name), alias_str))
+                part = '%s%s%s' % (connector, qn(name), alias_str)
+            for model, hint in self.query.hints.items():
+                if model._meta.db_table == name:
+                    part += ' USE INDEX (%s)' % ', '.join(hint)
+            result.append(part)
             first = False
         for t in self.query.extra_tables:
             alias, unused = self.query.table_alias(t)

django/db/models/sql/query.py

@@ -133 +133 @@
         self.distinct = False
         self.select_related = False
         self.related_select_cols = []
+        self.hints = {}
 
         # SQL aggregate-related attributes
         self.aggregates = SortedDict() # Maps alias -> SQL aggregate function
@@ -284 +285 @@
             obj._extra_select_cache = self._extra_select_cache.copy()
         obj.extra_tables = self.extra_tables
         obj.extra_order_by = self.extra_order_by
+        obj.hints = self.hints
         obj.deferred_loading = deepcopy(self.deferred_loading, memo=memo)
         if self.filter_is_sticky and self.used_aliases:
             obj.used_aliases = self.used_aliases.copy()
@@ -1641 +1643 @@
         if order_by:
             self.extra_order_by = order_by
 
+    def add_hint(self, model, hint):
+        add_to_dict(self.hints, model, hint)
+            
     def clear_deferred_loading(self):
         """
         Remove any fields from the deferred loading set.

django/db/models/query.py

@@ -708 +708 @@
         clone._db = alias
         return clone
 
+    def with_hints(self, *args, **kwargs):
+        clone = self._clone()
+        for hint in args:
+            clone.query.add_hint(self.model, hint)
+        for model, hint in kwargs.items():
+            clone.query.add_hint(model, hint)
+        return clone
+        
     ###################################
     # PUBLIC INTROSPECTION ATTRIBUTES #
     ###################################