Merge "Document SearchDatabase::doSearchTextInDB to return null"

This commit is contained in:
jenkins-bot 2019-08-01 21:51:36 +00:00 committed by Gerrit Code Review
commit f585244a77
5 changed files with 12 additions and 12 deletions

View file

@ -61,7 +61,7 @@ abstract class SearchDatabase extends SearchEngine {
* Perform a full text search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
abstract protected function doSearchTextInDB( $term );
@ -77,7 +77,7 @@ abstract class SearchDatabase extends SearchEngine {
* Perform a title-only search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
abstract protected function doSearchTitleInDB( $term );

View file

@ -33,7 +33,7 @@ class SearchMssql extends SearchDatabase {
* Perform a full text search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
protected function doSearchTextInDB( $term ) {
$dbr = $this->lb->getConnectionRef( DB_REPLICA );
@ -46,7 +46,7 @@ class SearchMssql extends SearchDatabase {
* Perform a title-only search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
protected function doSearchTitleInDB( $term ) {
$dbr = $this->lb->getConnectionRef( DB_REPLICA );

View file

@ -163,7 +163,7 @@ class SearchMySQL extends SearchDatabase {
* Perform a full text search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
protected function doSearchTextInDB( $term ) {
return $this->searchInternal( $term, true );
@ -173,7 +173,7 @@ class SearchMySQL extends SearchDatabase {
* Perform a title-only search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
protected function doSearchTitleInDB( $term ) {
return $this->searchInternal( $term, false );

View file

@ -64,11 +64,11 @@ class SearchOracle extends SearchDatabase {
* Perform a full text search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
protected function doSearchTextInDB( $term ) {
if ( $term == '' ) {
return new SqlSearchResultSet( false, '' );
return null;
}
$dbr = $this->lb->getConnectionRef( DB_REPLICA );
@ -80,11 +80,11 @@ class SearchOracle extends SearchDatabase {
* Perform a title-only search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
protected function doSearchTitleInDB( $term ) {
if ( $term == '' ) {
return new SqlSearchResultSet( false, '' );
return null;
}
$dbr = $this->lb->getConnectionRef( DB_REPLICA );

View file

@ -165,7 +165,7 @@ class SearchSqlite extends SearchDatabase {
* Perform a full text search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
protected function doSearchTextInDB( $term ) {
return $this->searchInternal( $term, true );
@ -175,7 +175,7 @@ class SearchSqlite extends SearchDatabase {
* Perform a title-only search query and return a result set.
*
* @param string $term Raw search term
* @return SqlSearchResultSet
* @return SqlSearchResultSet|null
*/
protected function doSearchTitleInDB( $term ) {
return $this->searchInternal( $term, false );