From fcf67bde0e263949b95a812811d484f34bf2624e Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 15 Sep 2016 19:36:40 -0700
Subject: [PATCH] Stub out DatabaseBase::getSearchEngine() as a dummy method

SearchEngineFactory::getSearchEngineClass() should be used instead

Change-Id: I984b80815633a8dc38a76d7de8a46ec249ae729f
---
 includes/db/DatabaseMssql.php                      |  7 -------
 includes/db/DatabaseOracle.php                     |  4 ----
 includes/db/DatabasePostgres.php                   |  4 ----
 includes/libs/rdbms/database/DatabaseBase.php      |  4 +---
 includes/libs/rdbms/database/DatabaseMysqlBase.php | 10 ----------
 includes/libs/rdbms/database/DatabaseSqlite.php    |  7 -------
 6 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 339174e7bb..be5fac9005 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -1257,13 +1257,6 @@ class DatabaseMssql extends DatabaseBase {
 		return $sql;
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getSearchEngine() {
-		return "SearchMssql";
-	}
-
 	/**
 	 * Returns an associative array for fields that are of type varbinary, binary, or image
 	 * $table can be either a raw table name or passed through tableName() first
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 9e821a15a3..ee1bf65731 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1509,10 +1509,6 @@ class DatabaseOracle extends DatabaseBase {
 		return 'CAST ( ' . $field . ' AS VARCHAR2 )';
 	}
 
-	public function getSearchEngine() {
-		return 'SearchOracle';
-	}
-
 	public function getInfinity() {
 		return '31-12-2030 12:00:00.000000';
 	}
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 2773067f83..e5ce283cbf 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1533,10 +1533,6 @@ SQL;
 		return $field . '::text';
 	}
 
-	public function getSearchEngine() {
-		return 'SearchPostgres';
-	}
-
 	public function streamStatementEnd( &$sql, &$newLine ) {
 		# Allow dollar quoting for function declarations
 		if ( substr( $newLine, 0, 4 ) == '$mw$' ) {
diff --git a/includes/libs/rdbms/database/DatabaseBase.php b/includes/libs/rdbms/database/DatabaseBase.php
index 2c8e67cd60..2c8d239073 100644
--- a/includes/libs/rdbms/database/DatabaseBase.php
+++ b/includes/libs/rdbms/database/DatabaseBase.php
@@ -75,10 +75,8 @@ abstract class DatabaseBase extends Database {
 	}
 
 	/**
-	 * Get search engine class. All subclasses of this need to implement this
-	 * if they wish to use searching.
-	 *
 	 * @return string
+	 * @deprecated since 1.27; use SearchEngineFactory::getSearchEngineClass()
 	 */
 	public function getSearchEngine() {
 		return 'SearchEngineDummy';
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index b3f1addb73..2d19081f88 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -1057,16 +1057,6 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
 		return true;
 	}
 
-	/**
-	 * Get search engine class. All subclasses of this
-	 * need to implement this if they wish to use searching.
-	 *
-	 * @return string
-	 */
-	public function getSearchEngine() {
-		return 'SearchMySQL';
-	}
-
 	/**
 	 * @param bool $value
 	 */
diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php
index 11acde78f6..817f8b45d2 100644
--- a/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@ -834,13 +834,6 @@ class DatabaseSqlite extends DatabaseBase {
 		return 'CAST ( ' . $field . ' AS TEXT )';
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getSearchEngine() {
-		return "SearchSqlite";
-	}
-
 	/**
 	 * No-op version of deadlockLoop
 	 *
-- 
2.20.1