Used joining instead of prefetching in Document.search()

The FK relationship between the models lends itself well to
a select_related() instead of a prefetch_related().

Additionally, this gets around a bug in 5.2 (initial release).

Author: bmispelon

docs/models.py

@@ -16,7 +16,7 @@
 )
 from django.core.cache import cache
 from django.db import models, transaction
-from django.db.models import Prefetch, Q
+from django.db.models import Q
 from django.db.models.fields.json import KeyTextTransform
 from django.utils.functional import cached_property
 from django.utils.html import strip_tags
@@ -269,15 +269,7 @@ def search(self, query_text, release):
                 config=models.F("config"),
             )
             base_qs = (
-                self.prefetch_related(
-                    Prefetch(
-                        "release",
-                        queryset=DocumentRelease.objects.only("lang", "release"),
-                    ),
-                    Prefetch(
-                        "release__release", queryset=Release.objects.only("version")
-                    ),
-                )
+                self.select_related("release__release")
                 .filter(release_id=release.id)
                 .annotate(
                     headline=search("title", search_query),
@@ -295,7 +287,8 @@ def search(self, query_text, release):
                 )
                 .only(
                     "path",
-                    "release",
+                    "release__lang",
+                    "release__release__version",
                 )
             )
             vector_qs = (

docs/tests/test_models.py

@@ -173,7 +173,9 @@ def test_get_available_languages_by_version(self):
 class DocumentManagerTest(TestCase):
     @classmethod
     def setUpTestData(cls):
-        cls.release = DocumentRelease.objects.create()
+        cls.release = DocumentRelease.objects.create(
+            release=Release.objects.create(version="1.2.3"),
+        )
         cls.release_fr = DocumentRelease.objects.create(lang="fr")
         documents = [
             {
@@ -450,11 +452,13 @@ def test_search_highlight_stemmed(self):
 
     def test_search_title(self):
         misspelled_query = Document.objects.search("viewss", self.release)
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(1):
             self.assertQuerySetEqual(
                 misspelled_query,
-                ["Generic views"],
-                transform=attrgetter("headline"),
+                [("Generic views", "en", "1.2.3")],
+                transform=attrgetter(
+                    "headline", "release.lang", "release.release.version"
+                ),
             )