Merge pull request #2012 from koordinates/fix-load-all-with-missing-model-results

acdha · web-flow · commit 64d2bc03efe2 · 2025-06-04T15:38:18.000-04:00
Fix RelatedSearchQueryset.load_all() truncating results
diff --git a/haystack/query.py b/haystack/query.py
@@ -194,9 +194,9 @@ def post_process_results(self, results):
                     # No objects were returned -- possible due to SQS nesting such as
                     # XYZ.objects.filter(id__gt=10) where the amount ignored are
                     # exactly equal to the ITERATOR_LOAD_PER_QUERY
-                    del self._result_cache[: len(results)]
-                    self._ignored_result_count += len(results)
-                    break
+                    del self._result_cache[:1]
+                    self._ignored_result_count += 1
+                    continue
 
             to_cache.append(result)
 
diff --git a/test_haystack/solr_tests/test_solr_backend.py b/test_haystack/solr_tests/test_solr_backend.py
@@ -1220,6 +1220,21 @@ def test_related_load_all_queryset(self):
         self.assertEqual([obj.object.id for obj in sqs], list(range(11, 24)))
         self.assertEqual([obj.object.id for obj in sqs[10:20]], [21, 22, 23])
 
+    def test_related_load_all_with_empty_model_results(self):
+        another_index = SolrAnotherMockModelSearchIndex()
+        another_index.update("solr")
+        self.ui.build(indexes=[self.smmi, another_index])
+
+        sqs = self.rsqs.order_by("id")
+        assert len(list(sqs)) == 25
+        sqs = sqs.all().load_all_queryset(
+            AnotherMockModel, AnotherMockModel.objects.none()
+        )
+        sqs = sqs.load_all()
+        # two AnotherMockModel objects are skipped, so only 23 results now
+        # (but those results are still present and weren't skipped)
+        assert len(list(sqs)) == 23
+
     def test_related_iter(self):
         reset_search_queries()
         self.assertEqual(len(connections["solr"].queries), 0)
