diff --git a/resources/sql/quickstart.sql b/resources/sql/quickstart.sql --- a/resources/sql/quickstart.sql +++ b/resources/sql/quickstart.sql @@ -9379,23 +9379,6 @@ KEY `key_type` (`documentType`,`documentCreated`) ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT}; -USE `{$NAMESPACE}_search`; - - SET NAMES utf8 ; - - SET character_set_client = {$CHARSET} ; - -CREATE TABLE `search_documentfield` ( - `phid` varbinary(64) NOT NULL, - `phidType` varchar(4) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL, - `field` varchar(4) CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} NOT NULL, - `auxPHID` varbinary(64) DEFAULT NULL, - `corpus` longtext CHARACTER SET {$CHARSET_FULLTEXT} COLLATE {$COLLATE_FULLTEXT}, - `stemmedCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT}, - KEY `phid` (`phid`), - FULLTEXT KEY `key_corpus` (`corpus`,`stemmedCorpus`) -) ENGINE=MyISAM DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT}; - USE `{$NAMESPACE}_search`; SET NAMES utf8 ; diff --git a/src/applications/config/check/PhabricatorMySQLSetupCheck.php b/src/applications/config/check/PhabricatorMySQLSetupCheck.php --- a/src/applications/config/check/PhabricatorMySQLSetupCheck.php +++ b/src/applications/config/check/PhabricatorMySQLSetupCheck.php @@ -167,19 +167,12 @@ "(in the %s section) and then restart %s:\n\n". "%s\n". "(You can also use a different file if you prefer. The file ". - "suggested above has about 50 of the most common English words.)\n\n". - "Finally, run this command to rebuild indexes using the new ". - "rules:\n\n". - "%s", + "suggested above has about 50 of the most common English words.)", $host_name, phutil_tag('tt', array(), 'my.cnf'), phutil_tag('tt', array(), '[mysqld]'), phutil_tag('tt', array(), 'mysqld'), - phutil_tag('pre', array(), 'ft_stopword_file='.$stopword_path), - phutil_tag( - 'pre', - array(), - "mysql> REPAIR TABLE {$namespace}_search.search_documentfield;")); + phutil_tag('pre', array(), 'ft_stopword_file='.$stopword_path)); $this->newIssue('mysql.ft_stopword_file') ->setName(pht('MySQL is Using Default Stopword File')) @@ -215,19 +208,12 @@ "only MySQL fulltext search is affected.\n\n". "To reduce the minimum word length to 3, add this to your %s file ". "(in the %s section) and then restart %s:\n\n". - "%s\n". - "Finally, run this command to rebuild indexes using the new ". - "rules:\n\n". - "%s", + "%s\n", $host_name, phutil_tag('tt', array(), 'my.cnf'), phutil_tag('tt', array(), '[mysqld]'), phutil_tag('tt', array(), 'mysqld'), - phutil_tag('pre', array(), 'ft_min_word_len=3'), - phutil_tag( - 'pre', - array(), - "mysql> REPAIR TABLE {$namespace}_search.search_documentfield;")); + phutil_tag('pre', array(), 'ft_min_word_len=3')); $this->newIssue('mysql.ft_min_word_len') ->setName(pht('MySQL is Using Default Minimum Word Length')) diff --git a/src/docs/contributor/database.diviner b/src/docs/contributor/database.diviner --- a/src/docs/contributor/database.diviner +++ b/src/docs/contributor/database.diviner @@ -10,10 +10,7 @@ Phorge uses MySQL or another MySQL-compatible database (like MariaDB or Amazon RDS). -Phorge uses the InnoDB table engine. The only exception is the -`search_documentfield` table which uses MyISAM because MySQL doesn't support -fulltext search in InnoDB (recent versions do, but we haven't added support -yet). +Phorge uses the InnoDB table engine. We are unlikely to ever support other incompatible databases like PostgreSQL or SQLite.