dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "selenium: stop running extensions/skins specs"
[lhc/web/wiklou.git]
/
maintenance
/
sql.php
diff --git
a/maintenance/sql.php
b/maintenance/sql.php
index
6a4cf04
..
21d8b2d
100644
(file)
--- a/
maintenance/sql.php
+++ b/
maintenance/sql.php
@@
-25,7
+25,7
@@
require_once __DIR__ . '/Maintenance.php';
use MediaWiki\MediaWikiServices;
require_once __DIR__ . '/Maintenance.php';
use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\
I
ResultWrapper;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\DBQueryError;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\DBQueryError;
@@
-83,8
+83,7
@@
class MwSql extends Maintenance {
$index = DB_MASTER;
}
$index = DB_MASTER;
}
- /** @var IDatabase $db DB handle for the appropriate cluster/wiki */
- $db = $lb->getConnection( $index, [], $wiki );
+ $db = $lb->getMaintenanceConnectionRef( $index, [], $wiki );
if ( $replicaDB != '' && $db->getLBInfo( 'master' ) !== null ) {
$this->fatalError( "The server selected ({$db->getServer()}) is not a replica DB." );
}
if ( $replicaDB != '' && $db->getLBInfo( 'master' ) !== null ) {
$this->fatalError( "The server selected ({$db->getServer()}) is not a replica DB." );
}
@@
-186,7
+185,7
@@
class MwSql extends Maintenance {
/**
* Print the results, callback for $db->sourceStream()
/**
* Print the results, callback for $db->sourceStream()
- * @param ResultWrapper|bool $res
+ * @param
I
ResultWrapper|bool $res
* @param IDatabase $db
* @return int|null Number of rows selected or updated, or null if the query was unsuccessful.
*/
* @param IDatabase $db
* @return int|null Number of rows selected or updated, or null if the query was unsuccessful.
*/