r45830 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r45829‎ | r45830 | r45831 >
Date:09:56, 17 January 2009
Author:catrope
Status:reverted
Tags:
Comment:
Fix up r45819 per CR comments: removing calls to removed function Database::indexName()
Modified paths:
  • /trunk/phase3/includes/db/Database.php (modified) (history)
  • /trunk/phase3/includes/db/DatabaseSqlite.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/db/Database.php
@@ -1191,7 +1191,6 @@
11921192 # SHOW INDEX should work for 3.x and up:
11931193 # http://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
11941194 $table = $this->tableName( $table );
1195 - $index = $this->indexName( $index );
11961195 $sql = 'SHOW INDEX FROM '.$table;
11971196 $res = $this->query( $sql, $fname );
11981197 if ( !$res ) {
Index: trunk/phase3/includes/db/DatabaseSqlite.php
@@ -194,7 +194,7 @@
195195 * - if errors are explicitly ignored, returns NULL on failure
196196 */
197197 function indexInfo($table, $index, $fname = 'Database::indexExists') {
198 - $sql = 'PRAGMA index_info(' . $this->addQuotes( $this->indexName( $index ) ) . ')';
 198+ $sql = 'PRAGMA index_info(' . $this->addQuotes( $index ) . ')';
199199 $res = $this->query( $sql, $fname );
200200 if ( !$res ) {
201201 return null;
@@ -213,7 +213,7 @@
214214 $row = $this->selectRow( 'sqlite_master', '*',
215215 array(
216216 'type' => 'index',
217 - 'name' => $this->indexName( $index ),
 217+ 'name' => $index,
218218 ), $fname );
219219 if ( !$row || !isset( $row->sql ) ) {
220220 return null;

Follow-up revisions

RevisionCommit summaryAuthorDate
r45891Revert r45821, r45830, r45831 and r45835 all in order to revert r45819, per d...catrope13:56, 19 January 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r45819Attempt at cleaning up r45764, r45769 (renamed indices for SQLite compat):...catrope23:02, 16 January 2009

Status & tagging log