aboutsummaryrefslogtreecommitdiffstats
path: root/maintenance
diff options
context:
space:
mode:
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>2024-06-03 20:07:31 +0000
committerGerrit Code Review <gerrit@wikimedia.org>2024-06-03 20:07:31 +0000
commitaab03425c082beb7be9445ebce7d6480cbac2ebb (patch)
tree5c0b0a59f50286068862bf983be2c15e64349682 /maintenance
parent332b97c9dd21e07c49b3c87cd4cad93872b526a6 (diff)
parentef2329c0121de566a755b4157a1221958df54fdd (diff)
downloadmediawikicore-aab03425c082beb7be9445ebce7d6480cbac2ebb.tar.gz
mediawikicore-aab03425c082beb7be9445ebce7d6480cbac2ebb.zip
Merge "rdbms: Warn about queries that don't provide the caller"
Diffstat (limited to 'maintenance')
-rw-r--r--maintenance/migrateBlocks.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/maintenance/migrateBlocks.php b/maintenance/migrateBlocks.php
index dbbabc5a4078..007080979902 100644
--- a/maintenance/migrateBlocks.php
+++ b/maintenance/migrateBlocks.php
@@ -39,10 +39,13 @@ class MigrateBlocks extends LoggedUpdateMaintenance {
protected function doDBUpdates() {
$this->dbw = $this->getDB( DB_PRIMARY );
- if ( !$this->dbw->tableExists( 'block', __METHOD__ ) || !$this->dbw->tableExists( 'block_target' ) ) {
+ if (
+ !$this->dbw->tableExists( 'block', __METHOD__ ) ||
+ !$this->dbw->tableExists( 'block_target', __METHOD__ )
+ ) {
$this->fatalError( "Run update.php to create the block and block_target tables." );
}
- if ( !$this->dbw->tableExists( 'ipblocks' ) ) {
+ if ( !$this->dbw->tableExists( 'ipblocks', __METHOD__ ) ) {
$this->output( "No ipblocks table, skipping migration to block_target.\n" );
return true;
}