makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17491] Fix rows duplication in search results

Browse source 
PHPBB-17491
This commit is contained in:
rxu 2025-05-07 00:01:05 +07:00
parent 1c399dcab7
commit 3d76a8bd09
No known key found for this signature in database
GPG key ID: 955F0567380E586A
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/search/fulltext_mysql.php
View file

@ -832,6 +832,8 @@ class fulltext_mysql extends \phpbb\search\base
// Build the query for really selecting the post_ids // Build the query for really selecting the post_ids
if ($type == 'posts') if ($type == 'posts')
{ {
// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
$sql = "SELECT $sql_select $sql = "SELECT $sql_select
FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . " FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
WHERE $sql_author WHERE $sql_author

2
phpBB/phpbb/search/fulltext_native.php
View file

@ -1251,6 +1251,8 @@ class fulltext_native extends \phpbb\search\base
// Build the query for really selecting the post_ids // Build the query for really selecting the post_ids
if ($type == 'posts') if ($type == 'posts')
{ {
// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
$sql = "SELECT $select $sql = "SELECT $select
FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . " FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . "
WHERE $sql_author WHERE $sql_author

2
phpBB/phpbb/search/fulltext_postgres.php
View file

@ -764,6 +764,8 @@ class fulltext_postgres extends \phpbb\search\base
// Build the query for really selecting the post_ids // Build the query for really selecting the post_ids
if ($type == 'posts') if ($type == 'posts')
{ {
// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
$sql = "SELECT p.post_id $sql = "SELECT p.post_id
FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . " FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
WHERE $sql_author WHERE $sql_author

3
tests/functional/search/base.php
View file

@ -300,7 +300,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
); );
// Browse the rest of search results pages with new sort direction // Browse the rest of search results pages with new sort direction
foreach (range(2, $last_page) as $page_number) $pages = range(2, $last_page);
foreach ($pages as $page_number)
{ {
$crawler = self::$client->click($pagination->selectLink($page_number)->link()); $crawler = self::$client->click($pagination->selectLink($page_number)->link());
$pagination = $crawler->filter('.pagination')->eq(0); $pagination = $crawler->filter('.pagination')->eq(0);