From d189aaee054b49e2778ce5c695b9eccc3bdb2728 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sun, 24 Oct 2010 21:27:33 +0000 Subject: [PATCH] (bug 24853) Kill failFunction - Fixed! :D --- includes/db/Database.php | 10 +++------- includes/db/DatabaseIbm_db2.php | 9 +++------ includes/db/DatabaseMssql.php | 8 +++----- includes/db/DatabaseOracle.php | 10 ++++------ includes/db/DatabasePostgres.php | 7 +++---- includes/db/DatabaseSqlite.php | 6 +++--- includes/db/LoadBalancer.php | 10 ++++------ 7 files changed, 23 insertions(+), 37 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index 67979b8265..e6a461d73d 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -32,7 +32,6 @@ interface DatabaseType { /** * Open a connection to the database. Usually aborts on failure - * If the failFunction is set to a non-zero integer, returns success * * @param $server String: database server host * @param $user String: database user name @@ -210,7 +209,6 @@ abstract class DatabaseBase implements DatabaseType { protected $mServer, $mUser, $mPassword, $mConn = null, $mDBname; protected $mOpened = false; - protected $mFailFunction; protected $mTablePrefix; protected $mFlags; protected $mTrxLevel = 0; @@ -479,12 +477,11 @@ abstract class DatabaseBase implements DatabaseType { * @param $user String: database user name * @param $password String: database user password * @param $dbName String: database name - * @param $failFunction * @param $flags * @param $tablePrefix String: database table prefixes. By default use the prefix gave in LocalSettings.php */ function __construct( $server = false, $user = false, $password = false, $dbName = false, - $failFunction = false, $flags = 0, $tablePrefix = 'get from global' + $flags = 0, $tablePrefix = 'get from global' ) { global $wgOut, $wgDBprefix, $wgCommandLineMode; @@ -527,12 +524,11 @@ abstract class DatabaseBase implements DatabaseType { * @param $user String: database user name * @param $password String: database user password * @param $dbName String: database name - * @param failFunction * @param $flags */ - static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 ) { + static function newFromParams( $server, $user, $password, $dbName, $flags = 0 ) { wfDeprecated( __METHOD__ ); - return new DatabaseMysql( $server, $user, $password, $dbName, $failFunction, $flags ); + return new DatabaseMysql( $server, $user, $password, $dbName, $flags ); } protected function installErrorHandler() { diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php index 5fbf81c7ae..b695d0b705 100644 --- a/includes/db/DatabaseIbm_db2.php +++ b/includes/db/DatabaseIbm_db2.php @@ -116,7 +116,6 @@ class DatabaseIbm_db2 extends DatabaseBase { protected $mServer, $mUser, $mPassword, $mConn = null, $mDBname; protected $mOut, $mOpened = false; - protected $mFailFunction; protected $mTablePrefix; protected $mFlags; protected $mTrxLevel = 0; @@ -257,13 +256,12 @@ class DatabaseIbm_db2 extends DatabaseBase { * @param $user String: username * @param $password String: password * @param $dbName String: database name on the server - * @param $failFunction Callback (optional) * @param $flags Integer: database behaviour flags (optional, unused) * @param $schema String */ public function DatabaseIbm_db2( $server = false, $user = false, $password = false, - $dbName = false, $failFunction = false, $flags = 0, + $dbName = false, $flags = 0, $schema = self::USE_GLOBAL ) { @@ -437,15 +435,14 @@ ERROR; * @param $user String: username * @param $password String * @param $dbName String: database name on the server - * @param $failFunction Callback (optional) * @param $flags Integer: database behaviour flags (optional, unused) * @return DatabaseIbm_db2 object */ static function newFromParams( $server, $user, $password, $dbName, - $failFunction = false, $flags = 0 ) + $flags = 0 ) { return new DatabaseIbm_db2( $server, $user, $password, $dbName, - $failFunction, $flags ); + $flags ); } /** diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index d44bf323f7..94172e2fda 100644 --- a/includes/db/DatabaseMssql.php +++ b/includes/db/DatabaseMssql.php @@ -18,7 +18,7 @@ class DatabaseMssql extends DatabaseBase { var $mAffectedRows = NULL; function __construct( $server = false, $user = false, $password = false, $dbName = false, - $failFunction = false, $flags = 0 ) + $flags = 0 ) { $this->mFlags = $flags; $this->open( $server, $user, $password, $dbName ); @@ -49,14 +49,12 @@ class DatabaseMssql extends DatabaseBase { return false; } - static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 ) - { - return new DatabaseMssql( $server, $user, $password, $dbName, $failFunction, $flags ); + static function newFromParams( $server, $user, $password, $dbName, $flags = 0 ) { + return new DatabaseMssql( $server, $user, $password, $dbName, $flags ); } /** * Usually aborts on failure - * If the failFunction is set to a non-zero integer, returns success */ function open( $server, $user, $password, $dbName ) { # Test for driver support, to avoid suppressed fatal error diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index e43613da05..dd7294e9a5 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -185,10 +185,10 @@ class DatabaseOracle extends DatabaseBase { var $mFieldInfoCache = array(); function __construct( $server = false, $user = false, $password = false, $dbName = false, - $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) + $flags = 0, $tablePrefix = 'get from global' ) { $tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix : strtoupper( $tablePrefix ); - parent::__construct( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); + parent::__construct( $server, $user, $password, $dbName, $flags, $tablePrefix ); wfRunHooks( 'DatabaseOraclePostInit', array( &$this ) ); } @@ -218,14 +218,12 @@ class DatabaseOracle extends DatabaseBase { return true; } - static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0, $tablePrefix ) - { - return new DatabaseOracle( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); + static function newFromParams( $server, $user, $password, $dbName, $flags = 0, $tablePrefix ) { + return new DatabaseOracle( $server, $user, $password, $dbName, $flags, $tablePrefix ); } /** * Usually aborts on failure - * If the failFunction is set to a non-zero integer, returns success */ function open( $server, $user, $password, $dbName ) { if ( !function_exists( 'oci_connect' ) ) { diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index ddf2fdb991..5d29e25d89 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -101,7 +101,7 @@ class DatabasePostgres extends DatabaseBase { var $mAffectedRows = null; function __construct( $server = false, $user = false, $password = false, $dbName = false, - $failFunction = false, $flags = 0 ) + $flags = 0 ) { $this->mFlags = $flags; $this->open( $server, $user, $password, $dbName ); @@ -144,13 +144,12 @@ class DatabasePostgres extends DatabaseBase { return $this->numRows( $res ); } - static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 ) { - return new DatabasePostgres( $server, $user, $password, $dbName, $failFunction, $flags ); + static function newFromParams( $server, $user, $password, $dbName, $flags = 0 ) { + return new DatabasePostgres( $server, $user, $password, $dbName, $flags ); } /** * Usually aborts on failure - * If the failFunction is set to a non-zero integer, returns success */ function open( $server, $user, $password, $dbName ) { # Test for Postgres support, to avoid suppressed fatal error diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php index 1313252329..151662bb0b 100644 --- a/includes/db/DatabaseSqlite.php +++ b/includes/db/DatabaseSqlite.php @@ -23,7 +23,7 @@ class DatabaseSqlite extends DatabaseBase { * Constructor. * Parameters $server, $user and $password are not used. */ - function __construct( $server = false, $user = false, $password = false, $dbName = false, $failFunction = false, $flags = 0 ) { + function __construct( $server = false, $user = false, $password = false, $dbName = false, $flags = 0 ) { global $wgSharedDB; $this->mFlags = $flags; $this->mName = $dbName; @@ -42,8 +42,8 @@ class DatabaseSqlite extends DatabaseBase { */ function implicitGroupby() { return false; } - static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 ) { - return new DatabaseSqlite( $server, $user, $password, $dbName, $failFunction, $flags ); + static function newFromParams( $server, $user, $password, $dbName, $flags = 0 ) { + return new DatabaseSqlite( $server, $user, $password, $dbName, $flags ); } /** Open an SQLite database and return a resource handle to it diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php index e94ebb2288..b0dc4839f1 100644 --- a/includes/db/LoadBalancer.php +++ b/includes/db/LoadBalancer.php @@ -14,7 +14,7 @@ */ class LoadBalancer { /* private */ var $mServers, $mConns, $mLoads, $mGroupLoads; - /* private */ var $mFailFunction, $mErrorConnection; + /* private */ var $mErrorConnection; /* private */ var $mReadIndex, $mAllowLagged; /* private */ var $mWaitForPos, $mWaitTimeout; /* private */ var $mLaggedSlaveMode, $mLastError = 'Unknown error'; @@ -24,7 +24,6 @@ class LoadBalancer { /** * @param $params Array with keys: * servers Required. Array of server info structures. - * failFunction Deprecated, use exceptions instead. * masterWaitTimeout Replication lag wait timeout * loadMonitor Name of a class used to fetch server lag and load. */ @@ -68,9 +67,8 @@ class LoadBalancer { } } - static function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 ) - { - return new LoadBalancer( $servers, $failFunction, $waitTimeout ); + static function newFromParams( $servers, $waitTimeout = 10 ) { + return new LoadBalancer( $servers, $waitTimeout ); } /** @@ -643,7 +641,7 @@ class LoadBalancer { # Create object wfDebug( "Connecting to $host $dbname...\n" ); - $db = new $class( $host, $user, $password, $dbname, 1, $flags ); + $db = new $class( $host, $user, $password, $dbname, $flags ); if ( $db->isOpen() ) { wfDebug( "Connected to $host $dbname.\n" ); } else { -- 2.20.1