| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -612,10 +612,10 @@ |
| 613 | 613 | * |
| 614 | 614 | * @param $dbType String A possible DB type |
| 615 | 615 | * @param $p Array An array of options to pass to the constructor. |
| 616 | | - * Valid options are: host, user, password, dbname, flags, tableprefix |
| | 616 | + * Valid options are: host, user, password, dbName, flags, tablePrefix |
| 617 | 617 | * @return DatabaseBase subclass or null |
| 618 | 618 | */ |
| 619 | | - public final static function newFromType( $dbType, $p = array() ) { |
| | 619 | + public final static function factory( $dbType, $p = array() ) { |
| 620 | 620 | $canonicalDBTypes = array( |
| 621 | 621 | 'mysql', 'postgres', 'sqlite', 'oracle', 'mssql', 'ibm_db2' |
| 622 | 622 | ); |
| — | — | @@ -627,9 +627,9 @@ |
| 628 | 628 | isset( $p['host'] ) ? $p['host'] : false, |
| 629 | 629 | isset( $p['user'] ) ? $p['user'] : false, |
| 630 | 630 | isset( $p['password'] ) ? $p['password'] : false, |
| 631 | | - isset( $p['dbname'] ) ? $p['dbname'] : false, |
| | 631 | + isset( $p['dbName'] ) ? $p['dbName'] : false, |
| 632 | 632 | isset( $p['flags'] ) ? $p['flags'] : 0, |
| 633 | | - isset( $p['tableprefix'] ) ? $p['tableprefix'] : 'get from global' |
| | 633 | + isset( $p['tablePrefix'] ) ? $p['tablePrefix'] : 'get from global' |
| 634 | 634 | ); |
| 635 | 635 | } else { |
| 636 | 636 | return null; |
| Index: trunk/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -669,7 +669,7 @@ |
| 670 | 670 | |
| 671 | 671 | # Create object |
| 672 | 672 | wfDebug( "Connecting to $host $dbname...\n" ); |
| 673 | | - $db = DatabaseBase::newFromType( $server['type'], $server ); |
| | 673 | + $db = DatabaseBase::factory( $server['type'], $server ); |
| 674 | 674 | if ( $db->isOpen() ) { |
| 675 | 675 | wfDebug( "Connected to $host $dbname.\n" ); |
| 676 | 676 | } else { |
| Index: trunk/phase3/includes/filerepo/ForeignDBRepo.php |
| — | — | @@ -35,14 +35,14 @@ |
| 36 | 36 | |
| 37 | 37 | function getMasterDB() { |
| 38 | 38 | if ( !isset( $this->dbConn ) ) { |
| 39 | | - $this->dbConn = DatabaseBase::newFromType( $this->dbType, |
| | 39 | + $this->dbConn = DatabaseBase::factory( $this->dbType, |
| 40 | 40 | array( |
| 41 | 41 | 'host' => $this->dbServer, |
| 42 | 42 | 'user' => $this->dbUser, |
| 43 | 43 | 'password' => $this->dbPassword, |
| 44 | | - 'dbname' => $this->dbName, |
| | 44 | + 'dbName' => $this->dbName, |
| 45 | 45 | 'flags' => $this->dbFlags, |
| 46 | | - 'tableprefix' => $this->tablePrefix |
| | 46 | + 'tablePrefix' => $this->tablePrefix |
| 47 | 47 | ) |
| 48 | 48 | ); |
| 49 | 49 | } |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -417,7 +417,7 @@ |
| 418 | 418 | |
| 419 | 419 | $dbSupport = ''; |
| 420 | 420 | foreach( $this->parent->getDBTypes() as $type ) { |
| 421 | | - $link = DatabaseBase::newFromType( $type )->getSoftwareLink(); |
| | 421 | + $link = DatabaseBase::factory( $type )->getSoftwareLink(); |
| 422 | 422 | $dbSupport .= wfMsgNoTrans( "config-support-$type", $link ) . "\n"; |
| 423 | 423 | } |
| 424 | 424 | $this->addHTML( $this->parent->getInfoBox( |
| Index: trunk/phase3/includes/extauth/MediaWiki.php |
| — | — | @@ -89,13 +89,13 @@ |
| 90 | 90 | private function initFromCond( $cond ) { |
| 91 | 91 | global $wgExternalAuthConf; |
| 92 | 92 | |
| 93 | | - $this->mDb = DatabaseBase::newFromType( $wgExternalAuthConf['DBtype'], |
| | 93 | + $this->mDb = DatabaseBase::factory( $wgExternalAuthConf['DBtype'], |
| 94 | 94 | array( |
| 95 | 95 | 'host' => $wgExternalAuthConf['DBserver'], |
| 96 | 96 | 'user' => $wgExternalAuthConf['DBuser'], |
| 97 | 97 | 'password' => $wgExternalAuthConf['DBpassword'], |
| 98 | | - 'dbname' => $wgExternalAuthConf['DBname'], |
| 99 | | - 'tableprefix' => $wgExternalAuthConf['DBprefix'], |
| | 98 | + 'dbName' => $wgExternalAuthConf['DBname'], |
| | 99 | + 'tablePrefix' => $wgExternalAuthConf['DBprefix'], |
| 100 | 100 | ) |
| 101 | 101 | ); |
| 102 | 102 | |
| Index: trunk/phase3/includes/extauth/vB.php |
| — | — | @@ -33,8 +33,8 @@ |
| 34 | 34 | * 'server' => 'localhost', |
| 35 | 35 | * 'username' => 'forum', |
| 36 | 36 | * 'password' => 'udE,jSqDJ<""p=fI.K9', |
| 37 | | - * 'dbname' => 'forum', |
| 38 | | - * 'tableprefix' => '', |
| | 37 | + * 'dbName' => 'forum', |
| | 38 | + * 'tablePrefix' => '', |
| 39 | 39 | * 'cookieprefix' => 'bb' |
| 40 | 40 | * ); |
| 41 | 41 | * |
| — | — | @@ -107,9 +107,9 @@ |
| 108 | 108 | $wgExternalAuthConf['server'], |
| 109 | 109 | $wgExternalAuthConf['username'], |
| 110 | 110 | $wgExternalAuthConf['password'], |
| 111 | | - $wgExternalAuthConf['dbname'], |
| | 111 | + $wgExternalAuthConf['dbName'], |
| 112 | 112 | 0, |
| 113 | | - $wgExternalAuthConf['tableprefix'] |
| | 113 | + $wgExternalAuthConf['tablePrefix'] |
| 114 | 114 | ); |
| 115 | 115 | } |
| 116 | 116 | |