Replace remaining uses of deprecated DB_SLAVE with DB_REPLICA

Change 950cf6016c took care of the most,
but a few remain, either outside of includes/ and maintenance/
directories (which that change was limited to), or in code introduced
afterwards.

Change-Id: I9c363d0219ea7e71cde520faba39406949a36d27
This commit is contained in:
Bartosz Dziewoński 2017-08-04 20:53:34 +02:00 committed by Umherirrender
parent 033a89c6ca
commit 8785e4a5b3
10 changed files with 19 additions and 19 deletions

View file

@ -17,7 +17,7 @@ description of the tables and their contents, please see:
To make a read query, something like this usually suffices:
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( /* ...see docs... */ );
foreach ( $res as $row ) {
...

View file

@ -68,7 +68,7 @@ class UncategorizedCategoriesPage extends UncategorizedPagesPage {
}
public function getQueryInfo() {
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$query = parent::getQueryInfo();
$exceptionList = $this->getExceptionList();
if ( $exceptionList ) {

View file

@ -4537,7 +4537,7 @@ class Language {
public function formatExpiry( $expiry, $format = true, $infinity = 'infinity' ) {
static $dbInfinity;
if ( $dbInfinity === null ) {
$dbInfinity = wfGetDB( DB_SLAVE )->getInfinity();
$dbInfinity = wfGetDB( DB_REPLICA )->getInfinity();
}
if ( $expiry == '' || $expiry === 'infinity' || $expiry == $dbInfinity ) {

View file

@ -150,7 +150,7 @@ if ( !$wgEnableProfileInfo ) {
exit( 1 );
}
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
if ( !$dbr->tableExists( 'profiling' ) ) {
echo '<p>No <code>profiling</code> table exists, so we can\'t show you anything.</p>'

View file

@ -1490,7 +1490,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
' method should return true. Use @group Database or $this->tablesUsed.' );
}
$db = wfGetDB( DB_SLAVE );
$db = wfGetDB( DB_REPLICA );
$res = $db->select( $table, $fields, $condition, wfGetCaller(), [ 'ORDER BY' => $fields ] );
$this->assertNotEmpty( $res, "query failed: " . $db->lastError() );

View file

@ -145,7 +145,7 @@ class RevisionStorageTest extends MediaWikiTestCase {
public function testConstructFromRow() {
$orig = $this->makeRevision();
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'revision', '*', [ 'rev_id' => $orig->getId() ] );
$this->assertTrue( is_object( $res ), 'query failed' );
@ -163,7 +163,7 @@ class RevisionStorageTest extends MediaWikiTestCase {
public function testNewFromRow() {
$orig = $this->makeRevision();
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'revision', '*', [ 'rev_id' => $orig->getId() ] );
$this->assertTrue( is_object( $res ), 'query failed' );
@ -187,7 +187,7 @@ class RevisionStorageTest extends MediaWikiTestCase {
$orig = $page->getRevision();
$page->doDeleteArticle( 'test Revision::newFromArchiveRow' );
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'archive', '*', [ 'ar_rev_id' => $orig->getId() ] );
$this->assertTrue( is_object( $res ), 'query failed' );

View file

@ -58,7 +58,7 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase {
->getMock();
$mock->expects( $this->any() )
->method( 'getConnectionRef' )
->with( DB_SLAVE )
->with( DB_REPLICA )
->will( $this->returnValue( $mockDb ) );
return $mock;
}

View file

@ -1466,7 +1466,7 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
public function provideDbTypes() {
return [
[ false, DB_SLAVE ],
[ false, DB_REPLICA ],
[ true, DB_MASTER ],
];
}

View file

@ -88,8 +88,8 @@ class LBFactoryTest extends MediaWikiTestCase {
$dbw = $lb->getConnection( DB_MASTER );
$this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' );
$dbr = $lb->getConnection( DB_SLAVE );
$this->assertTrue( $dbr->getLBInfo( 'master' ), 'DB_SLAVE also gets the master' );
$dbr = $lb->getConnection( DB_REPLICA );
$this->assertTrue( $dbr->getLBInfo( 'master' ), 'DB_REPLICA also gets the master' );
$factory->shutdown();
$lb->closeAll();
@ -134,7 +134,7 @@ class LBFactoryTest extends MediaWikiTestCase {
$dbw->getLBInfo( 'clusterMasterHost' ),
'cluster master set' );
$dbr = $lb->getConnection( DB_SLAVE );
$dbr = $lb->getConnection( DB_REPLICA );
$this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' );
$this->assertEquals(
( $wgDBserver != '' ) ? $wgDBserver : 'localhost',
@ -175,7 +175,7 @@ class LBFactoryTest extends MediaWikiTestCase {
$dbw = $lb->getConnection( DB_MASTER );
$this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' );
$dbr = $lb->getConnection( DB_SLAVE );
$dbr = $lb->getConnection( DB_REPLICA );
$this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' );
$factory->shutdown();

View file

@ -117,7 +117,7 @@ class WikiPageTest extends MediaWikiLangTestCase {
$id = $page->getId();
# ------------------------
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'pagelinks', '*', [ 'pl_from' => $id ] );
$n = $res->numRows();
$res->free();
@ -147,7 +147,7 @@ class WikiPageTest extends MediaWikiLangTestCase {
$this->assertTrue( $content->equals( $retrieved ), 'retrieved content doesn\'t equal original' );
# ------------------------
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'pagelinks', '*', [ 'pl_from' => $id ] );
$n = $res->numRows();
$res->free();
@ -195,7 +195,7 @@ class WikiPageTest extends MediaWikiLangTestCase {
$jobs->execute();
# ------------------------
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'pagelinks', '*', [ 'pl_from' => $id ] );
$n = $res->numRows();
$res->free();
@ -225,7 +225,7 @@ class WikiPageTest extends MediaWikiLangTestCase {
$jobs->execute();
# ------------------------
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'pagelinks', '*', [ 'pl_from' => $id ] );
$n = $res->numRows();
$res->free();
@ -827,7 +827,7 @@ more stuff
# we are having issues with doRollback spuriously failing. Apparently
# the last revision somehow goes missing or not committed under some
# circumstances. So, make sure the last revision has the right user name.
$dbr = wfGetDB( DB_SLAVE );
$dbr = wfGetDB( DB_REPLICA );
$this->assertEquals( 3, Revision::countByPageId( $dbr, $page->getId() ) );
$page = new WikiPage( $page->getTitle() );