Hello Aaron Schulz, Brian Wolff, jenkins-bot, I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/344601 to review the following change. Change subject: Revert "Remove old remapping hacks from Database::indexName()" ...................................................................... Revert "Remove old remapping hacks from Database::indexName()" This reverts commit bec6151e5fe30e780d82527c4c53e54379149a4e. Change-Id: I1c67aa464a1f151562ef92fce03f825113847814 --- M includes/libs/rdbms/database/Database.php M includes/libs/rdbms/database/DatabaseSqlite.php 2 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/01/344601/1 diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 4f663b3..7e80221 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -1981,7 +1981,18 @@ * @return string */ protected function indexName( $index ) { - return $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; + } } public function addQuotes( $s ) { diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php index f201dad..2281f23 100644 --- a/includes/libs/rdbms/database/DatabaseSqlite.php +++ b/includes/libs/rdbms/database/DatabaseSqlite.php @@ -427,6 +427,16 @@ } /** + * Index names have DB scope + * + * @param string $index + * @return string + */ + protected function indexName( $index ) { + return $index; + } + + /** * This must be called after nextSequenceVal * * @return int -- To view, visit https://gerrit.wikimedia.org/r/344601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c67aa464a1f151562ef92fce03f825113847814 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits