Fix up r45819 per CR comments: removing calls to removed function Database::indexName()

diff --git a/includes/db/Database.php b/includes/db/Database.php
index e2175d1..81bc1b2 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1191,7 +1191,6 @@ class Database {
                # SHOW INDEX should work for 3.x and up:
                # http://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
                $table = $this->tableName( $table );
-               $index = $this->indexName( $index );
                $sql = 'SHOW INDEX FROM '.$table;
                $res = $this->query( $sql, $fname );
                if ( !$res ) {

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index c91374b..b80cd68 100644 (file)
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -194,7 +194,7 @@ class DatabaseSqlite extends Database {
         * - if errors are explicitly ignored, returns NULL on failure
         */
        function indexInfo($table, $index, $fname = 'Database::indexExists') {
-               $sql = 'PRAGMA index_info(' . $this->addQuotes( $this->indexName( $index ) ) . ')';
+               $sql = 'PRAGMA index_info(' . $this->addQuotes( $index ) . ')';
                $res = $this->query( $sql, $fname );
                if ( !$res ) {
                        return null;
@@ -213,7 +213,7 @@ class DatabaseSqlite extends Database {
                $row = $this->selectRow( 'sqlite_master', '*', 
                        array(
                                'type' => 'index',
-                               'name' => $this->indexName( $index ),
+                               'name' => $index,
                        ), $fname );
                if ( !$row || !isset( $row->sql ) ) {
                        return null;