]> BookStack Code Mirror - bookstack/commitdiff
Fixed search query issues when table prefixes are used
authorDan Brown <redacted>
Fri, 8 Oct 2021 14:25:12 +0000 (15:25 +0100)
committerDan Brown <redacted>
Fri, 8 Oct 2021 14:25:12 +0000 (15:25 +0100)
- Old raw select query was causing bad select clause in query
  when table prefixes were active.

app/Entities/Tools/SearchRunner.php

index 8e18408bd70b10864dbaea09fac3f8c902cd638c..ca592755b7e6ec716971b46f2fb9ab05c5c028ec 100644 (file)
@@ -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);
         }