Ticket #13033: admin-fulltext-12288.diff

contrib/admin/views/main.py

@@ -229 +229 @@
                 return "%s__icontains" % field_name
 
         if self.search_fields and self.query:
-            for bit in self.query.split():
-                or_queries = [models.Q(**{construct_search(str(field_name)): bit}) for field_name in self.search_fields]
-                qs = qs.filter(reduce(operator.or_, or_queries))
+            bits = self.query.split()
+            or_fields = [ f for f in self.search_fields if f[0] != '@' ]
+            ft_fields = [ f[1:] for f in self.search_fields if f[0] == '@' ]
+            if ft_fields:
+                match = ', '.join([ "`%s`.`%s`" % (self.opts.db_table, f) for f in ft_fields ])
+                sql = 'MATCH (%s) AGAINST (%%s IN BOOLEAN MODE)' % match
+                qs = qs.extra(where=[sql], params=[self.query])
+            for bit in bits:
+                or_queries = [ models.Q(**{construct_search(str(field_name)): bit}) 
+                               for field_name in or_fields ]
+                if or_queries:
+                    qs = qs.filter(reduce(operator.or_, or_queries))
             for field_name in self.search_fields:
                 if '__' in field_name:
                     qs = qs.distinct()