Merge "objectcache: Mention colons in BagOStuff key generation"

[lhc/web/wiklou.git] / maintenance / rebuildtextindex.php

diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php
index 37636c8..c786925 100644 (file)
--- a/maintenance/rebuildtextindex.php
+++ b/maintenance/rebuildtextindex.php
@@ -27,6 +27,9 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use Wikimedia\Rdbms\IMaintainableDatabase;
+use Wikimedia\Rdbms\DatabaseSqlite;
+
 /**
  * Maintenance script that rebuilds search index table from scratch.
  *
@@ -36,7 +39,7 @@ class RebuildTextIndex extends Maintenance {
        const RTI_CHUNK_SIZE = 500;
 
        /**
-        * @var Database
+        * @var IMaintainableDatabase
         */
        private $db;
 
@@ -108,9 +111,8 @@ class RebuildTextIndex extends Maintenance {
                        );
 
                        foreach ( $res as $s ) {
+                               $title = Title::makeTitle( $s->page_namespace, $s->page_title );
                                try {
-                                       $title = Title::makeTitle( $s->page_namespace, $s->page_title );
-
                                        $rev = new Revision( $s );
                                        $content = $rev->getContent();
 
@@ -143,9 +145,10 @@ class RebuildTextIndex extends Maintenance {
        private function createMysqlTextIndex() {
                $searchindex = $this->db->tableName( 'searchindex' );
                $this->output( "\nRebuild the index...\n" );
-               $sql = "ALTER TABLE $searchindex ADD FULLTEXT si_title (si_title), " .
-                       "ADD FULLTEXT si_text (si_text)";
-               $this->db->query( $sql, __METHOD__ );
+               foreach ( [ 'si_title', 'si_text' ] as $field ) {
+                       $sql = "ALTER TABLE $searchindex ADD FULLTEXT $field ($field)";
+                       $this->db->query( $sql, __METHOD__ );
+               }
        }
 
        /**