Commitd04a584

committed

Fix RelatedSearchQueryset.load_all() truncating results

1 parent7d139b4 commitd04a584Copy full SHA for d04a584

File tree

+18

-3

lines changed

+18

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,9 @@ def post_process_results(self, results):`
`194`	`194`	`# No objects were returned -- possible due to SQS nesting such as`
`195`	`195`	`# XYZ.objects.filter(id__gt=10) where the amount ignored are`
`196`	`196`	`# exactly equal to the ITERATOR_LOAD_PER_QUERY`
`197`		`-delself._result_cache[:len(results)]`
`198`		`-self._ignored_result_count+=len(results)`
`199`		`-break`
	`197`	`+delself._result_cache[:1]`
	`198`	`+self._ignored_result_count+=1`
	`199`	`+continue`
`200`	`200`
`201`	`201`	`to_cache.append(result)`
`202`	`202`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1220,6 +1220,21 @@ def test_related_load_all_queryset(self):`
`1220`	`1220`	`self.assertEqual([obj.object.idforobjinsqs],list(range(11,24)))`
`1221`	`1221`	`self.assertEqual([obj.object.idforobjinsqs[10:20]], [21,22,23])`
`1222`	`1222`
	`1223`	`+deftest_related_load_all_with_empty_model_results(self):`
	`1224`	`+another_index=SolrAnotherMockModelSearchIndex()`
	`1225`	`+another_index.update("solr")`
	`1226`	`+self.ui.build(indexes=[self.smmi,another_index])`
	`1227`	`+`
	`1228`	`+sqs=self.rsqs.order_by("id")`
	`1229`	`+assertlen(list(sqs))==25`
	`1230`	`+sqs=sqs.all().load_all_queryset(`
	`1231`	`+AnotherMockModel,AnotherMockModel.objects.none()`
	`1232`	`+ )`
	`1233`	`+sqs=sqs.load_all()`
	`1234`	`+# two AnotherMockModel objects are skipped, so only 23 results now`
	`1235`	`+# (but those results are still present and weren't skipped)`
	`1236`	`+assertlen(list(sqs))==23`
	`1237`	`+`
`1223`	`1238`	`deftest_related_iter(self):`
`1224`	`1239`	`reset_search_queries()`
`1225`	`1240`	`self.assertEqual(len(connections["solr"].queries),0)`

Comments

(0)