Ticket #27732: searchrankvectorfieldfix.diff

django/contrib/postgres/search.py

@@ -179 +179 @@
     _output_field = FloatField()
 
     def __init__(self, vector, query, **extra):
-        if not hasattr(vector, 'resolve_expression'):
-            vector = SearchVector(vector)
         if not hasattr(query, 'resolve_expression'):
             query = SearchQuery(query)
         weights = extra.get('weights')
@@ -203 +201 @@
         )
         return sql, extra_params + params
 
+    def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False):
+        resolved = super(SearchRank, self).resolve_expression(query, allow_joins, reuse, summarize, for_save)
+        resolved_source_expressions = resolved.get_source_expressions()
+        if not isinstance(resolved_source_expressions[0].output_field, SearchVectorField):
+            vector_resolved_expression = SearchVector(self.get_source_expressions()[0]).resolve_expression(query, allow_joins, reuse, summarize)
+            resolved.set_source_expressions([vector_resolved_expression] + resolved_source_expressions[1:])
+        return resolved
 
 SearchVectorField.register_lookup(SearchVectorExact)
 

tests/postgres_tests/test_search.py

@@ -112 +112 @@
         searched = Line.objects.filter(dialogue_search_vector=SearchQuery('cadeaux', config='french'))
         self.assertSequenceEqual(searched, [self.french])
 
+    def test_existing_vector_ranking(self):
+        Line.objects.update(dialogue_search_vector=SearchVector('dialogue'))
+        searched = Line.objects.filter(character=self.minstrel).annotate(
+            rank=SearchRank('dialogue_search_vector', SearchQuery('brave sir robin')),
+        ).order_by('rank')
+        self.assertSequenceEqual(searched, [self.verse2, self.verse1, self.verse0])
+
 
 class MultipleFieldsTest(GrailTestData, PostgreSQLTestCase):