From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 21 Sep 2016 19:52:17 +0000 (-0700)
Subject: Remove old remapping hacks from Database::indexName()
X-Git-Tag: 1.31.0-rc.0~3662^2~1
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=bec6151e5fe30e780d82527c4c53e54379149a4e;p=lhc%2Fweb%2Fwiklou.git

Remove old remapping hacks from Database::indexName()

Change-Id: Icab995aa6a442aab133da723363f794ef9128eb8
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 7e80221128..4f663b373c 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -1981,18 +1981,7 @@ abstract class Database implements IDatabase, LoggerAwareInterface {
 	 * @return string
 	 */
 	protected function indexName( $index ) {
-		// Backwards-compatibility hack
-		$renamed = [
-			'ar_usertext_timestamp' => 'usertext_timestamp',
-			'un_user_id' => 'user_id',
-			'un_user_ip' => 'user_ip',
-		];
-
-		if ( isset( $renamed[$index] ) ) {
-			return $renamed[$index];
-		} else {
-			return $index;
-		}
+		return $index;
 	}
 
 	public function addQuotes( $s ) {
diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php
index 2281f23ec8..f201dad006 100644
--- a/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@ -426,16 +426,6 @@ class DatabaseSqlite extends DatabaseBase {
 		return str_replace( '"', '', parent::tableName( $name, $format ) );
 	}
 
-	/**
-	 * Index names have DB scope
-	 *
-	 * @param string $index
-	 * @return string
-	 */
-	protected function indexName( $index ) {
-		return $index;
-	}
-
 	/**
 	 * This must be called after nextSequenceVal
 	 *