| Index: trunk/phase3/tests/phpunit/MediaWikiTestCase.php |
| — | — | @@ -12,7 +12,6 @@ |
| 13 | 13 | protected $oldTablePrefix; |
| 14 | 14 | protected $useTemporaryTables = true; |
| 15 | 15 | private static $dbSetup = false; |
| 16 | | - private static $dbTables = null; |
| 17 | 16 | |
| 18 | 17 | /** |
| 19 | 18 | * Table name prefixes. Oracle likes it shorter. |
| — | — | @@ -192,22 +191,18 @@ |
| 193 | 192 | protected function listTables() { |
| 194 | 193 | global $wgDBprefix; |
| 195 | 194 | |
| 196 | | - if( is_null( self::$dbTables ) ) { |
| 197 | | - $tables = $this->db->listTables( $wgDBprefix, __METHOD__ ); |
| 198 | | - $tables = array_map( array( __CLASS__, 'unprefixTable' ), $tables ); |
| | 195 | + $tables = $this->db->listTables( $wgDBprefix, __METHOD__ ); |
| | 196 | + $tables = array_map( array( __CLASS__, 'unprefixTable' ), $tables ); |
| 199 | 197 | |
| 200 | | - if ( $this->db->getType() == 'sqlite' ) { |
| 201 | | - $tables = array_flip( $tables ); |
| 202 | | - // these are subtables of searchindex and don't need to be duped/dropped separately |
| 203 | | - unset( $tables['searchindex_content'] ); |
| 204 | | - unset( $tables['searchindex_segdir'] ); |
| 205 | | - unset( $tables['searchindex_segments'] ); |
| 206 | | - $tables = array_flip( $tables ); |
| 207 | | - } |
| 208 | | - self::$dbTables = $tables; |
| | 198 | + if ( $this->db->getType() == 'sqlite' ) { |
| | 199 | + $tables = array_flip( $tables ); |
| | 200 | + // these are subtables of searchindex and don't need to be duped/dropped separately |
| | 201 | + unset( $tables['searchindex_content'] ); |
| | 202 | + unset( $tables['searchindex_segdir'] ); |
| | 203 | + unset( $tables['searchindex_segments'] ); |
| | 204 | + $tables = array_flip( $tables ); |
| 209 | 205 | } |
| 210 | | - return self::$dbTables; |
| 211 | | - |
| | 206 | + return $tables; |
| 212 | 207 | } |
| 213 | 208 | |
| 214 | 209 | protected function checkDbIsSupported() { |