Improved DB prefix support and removed old search method

diff --git a/app/Entity.php b/app/Entity.php
index 52b214eb3ab80ea9296af4c968dc207a8ae3cc1b..6aeb66481dc436ca4654d8acd5c1ed3603d6665e 100644 (file)
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -176,68 +176,5 @@ class Entity extends Ownable
      */
     public function entityRawQuery(){return '';}
 
-    /**
-     * Perform a full-text search on this entity.
-     * @param string[] $terms
-     * @param string[] array $wheres
-     * TODO - REMOVE
-     * @return mixed
-     */
-    public function fullTextSearchQuery($terms, $wheres = [])
-    {
-        $exactTerms = [];
-        $fuzzyTerms = [];
-        $search = static::newQuery();
-
-        foreach ($terms as $key => $term) {
-            $term = htmlentities($term, ENT_QUOTES);
-            $term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
-            if (preg_match('/&quot;.*?&quot;/', $term) || is_numeric($term)) {
-                $term = str_replace('&quot;', '', $term);
-                $exactTerms[] = '%' . $term . '%';
-            } else {
-                $term = '' . $term . '*';
-                if ($term !== '*') $fuzzyTerms[] = $term;
-            }
-        }
-
-        $isFuzzy = count($exactTerms) === 0 && count($fuzzyTerms) > 0;
-        $fieldsToSearch = ['name', $this->textField];
-
-        // Perform fulltext search if relevant terms exist.
-        if ($isFuzzy) {
-            $termString = implode(' ', $fuzzyTerms);
-
-            $search = $search->selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
-            $search = $search->whereRaw('MATCH(' . implode(',', $fieldsToSearch ). ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
-        }
-
-        // Ensure at least one exact term matches if in search
-        if (count($exactTerms) > 0) {
-            $search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
-                foreach ($exactTerms as $exactTerm) {
-                    foreach ($fieldsToSearch as $field) {
-                        $query->orWhere($field, 'like', $exactTerm);
-                    }
-                }
-            });
-        }
-
-        $orderBy = $isFuzzy ? 'title_relevance' : 'updated_at';
-
-        // Add additional where terms
-        foreach ($wheres as $whereTerm) {
-            $search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
-        }
-
-        // Load in relations
-        if ($this->isA('page')) {
-            $search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
-        } else if ($this->isA('chapter')) {
-            $search = $search->with('book');
-        }
-
-        return $search->orderBy($orderBy, 'desc');
-    }
 
 }

diff --git a/database/migrations/2015_08_31_175240_add_search_indexes.php b/database/migrations/2015_08_31_175240_add_search_indexes.php
index 99e5a28f08d797ac294b485f1b0cc13e1dbeb897..127f69d281415fccc24d6cd10e3d8b452a21b495 100644 (file)
--- a/database/migrations/2015_08_31_175240_add_search_indexes.php
+++ b/database/migrations/2015_08_31_175240_add_search_indexes.php
@@ -12,9 +12,10 @@ class AddSearchIndexes extends Migration
      */
     public function up()
     {
-        DB::statement('ALTER TABLE pages ADD FULLTEXT search(name, text)');
-        DB::statement('ALTER TABLE books ADD FULLTEXT search(name, description)');
-        DB::statement('ALTER TABLE chapters ADD FULLTEXT search(name, description)');
+        $prefix = DB::getTablePrefix();
+        DB::statement("ALTER TABLE {$prefix}pages ADD FULLTEXT search(name, text)");
+        DB::statement("ALTER TABLE {$prefix}books ADD FULLTEXT search(name, description)");
+        DB::statement("ALTER TABLE {$prefix}chapters ADD FULLTEXT search(name, description)");
     }
 
     /**

diff --git a/database/migrations/2015_12_05_145049_fulltext_weighting.php b/database/migrations/2015_12_05_145049_fulltext_weighting.php
index cef43f604419673f35bf3d71dc45a2b5817987e8..99813138764893f34571512225d07bf5d2fa9d13 100644 (file)
--- a/database/migrations/2015_12_05_145049_fulltext_weighting.php
+++ b/database/migrations/2015_12_05_145049_fulltext_weighting.php
@@ -12,9 +12,10 @@ class FulltextWeighting extends Migration
      */
     public function up()
     {
-        DB::statement('ALTER TABLE pages ADD FULLTEXT name_search(name)');
-        DB::statement('ALTER TABLE books ADD FULLTEXT name_search(name)');
-        DB::statement('ALTER TABLE chapters ADD FULLTEXT name_search(name)');
+        $prefix = DB::getTablePrefix();
+        DB::statement("ALTER TABLE {$prefix}pages ADD FULLTEXT name_search(name)");
+        DB::statement("ALTER TABLE {$prefix}books ADD FULLTEXT name_search(name)");
+        DB::statement("ALTER TABLE {$prefix}chapters ADD FULLTEXT name_search(name)");
     }
 
     /**

diff --git a/database/migrations/2017_03_19_091553_create_search_index_table.php b/database/migrations/2017_03_19_091553_create_search_index_table.php
index 2882839588d9eff660b5bb757ad515efa1594eb7..32c6a09e1c7de3f5fa617717866b4de6abfe7780 100644 (file)
--- a/database/migrations/2017_03_19_091553_create_search_index_table.php
+++ b/database/migrations/2017_03_19_091553_create_search_index_table.php
@@ -26,7 +26,19 @@ class CreateSearchIndexTable extends Migration
             $table->index('score');
         });
 
-        // TODO - Drop old fulltext indexes
+        // Drop search indexes
+        Schema::table('pages', function(Blueprint $table) {
+            $table->dropIndex('search');
+            $table->dropIndex('name_search');
+        });
+        Schema::table('books', function(Blueprint $table) {
+            $table->dropIndex('search');
+            $table->dropIndex('name_search');
+        });
+        Schema::table('chapters', function(Blueprint $table) {
+            $table->dropIndex('search');
+            $table->dropIndex('name_search');
+        });
 
         app(\BookStack\Services\SearchService::class)->indexAllEntities();
     }
@@ -38,6 +50,14 @@ class CreateSearchIndexTable extends Migration
      */
     public function down()
     {
+        $prefix = DB::getTablePrefix();
+        DB::statement("ALTER TABLE {$prefix}pages ADD FULLTEXT search(name, text)");
+        DB::statement("ALTER TABLE {$prefix}books ADD FULLTEXT search(name, description)");
+        DB::statement("ALTER TABLE {$prefix}chapters ADD FULLTEXT search(name, description)");
+        DB::statement("ALTER TABLE {$prefix}pages ADD FULLTEXT name_search(name)");
+        DB::statement("ALTER TABLE {$prefix}books ADD FULLTEXT name_search(name)");
+        DB::statement("ALTER TABLE {$prefix}chapters ADD FULLTEXT name_search(name)");
+
         Schema::dropIfExists('search_terms');
     }
 }