From: Dan Brown <redacted>
Date: Fri, 8 Oct 2021 14:25:12 +0000 (+0100)
Subject: Fixed search query issues when table prefixes are used
X-Git-Tag: v21.08.5~1^2~5
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/81d6b1b016bdbb6c7d01f7f7d0a14585d3104c55

Fixed search query issues when table prefixes are used

- Old raw select query was causing bad select clause in query
  when table prefixes were active.
---

diff --git a/app/Entities/Tools/SearchRunner.php b/app/Entities/Tools/SearchRunner.php
index 8e18408bd..ca592755b 100644
--- a/app/Entities/Tools/SearchRunner.php
+++ b/app/Entities/Tools/SearchRunner.php
@@ -156,7 +156,9 @@ class SearchRunner
             })->groupBy('entity_type', 'entity_id');
             $entitySelect->join($this->db->raw('(' . $subQuery->toSql() . ') as s'), function (JoinClause $join) {
                 $join->on('id', '=', 'entity_id');
-            })->selectRaw($entity->getTable() . '.*, s.score')->orderBy('score', 'desc');
+            })->addSelect($entity->getTable() . '.*')
+                ->selectRaw('s.score')
+                ->orderBy('score', 'desc');
             $entitySelect->mergeBindings($subQuery);
         }