Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add some missing __METHOD__ parameters to database calls

Browse source 
Plus fix a typo

Change-Id: I8ca326990559ea80254ce0cef2ed204590716679
This commit is contained in:
DannyS712 2021-06-05 08:26:50 +00:00 committed by Umherirrender
parent 4bd96ff4a5
commit a84ad7bd40
8 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/changetags/ChangeTags.php
View file

@ -915,17 +915,19 @@ class ChangeTags {
// tags for each revision. This does not work with temporary tables
// on some versions of MySQL, which causes phpunit tests to fail.
// As a hacky workaround, we copy the temporary table, and join
// against the copy. It is acknowledge that this is quite horrific.
// against the copy. It is acknowledged that this is quite horrific.
// Discuss at T256006.
$tagTable = 'change_tag_for_display_query';
$db->query(
'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $db->tableName( $tagTable )
. ' LIKE ' . $db->tableName( 'change_tag' )
. ' LIKE ' . $db->tableName( 'change_tag' ),
__METHOD__
);
$db->query(
'INSERT IGNORE INTO ' . $db->tableName( $tagTable )
. ' SELECT * FROM ' . $db->tableName( 'change_tag' )
. ' SELECT * FROM ' . $db->tableName( 'change_tag' ),
__METHOD__
);
}
}

2
includes/filerepo/file/LocalFile.php
View file

@ -1851,7 +1851,7 @@ class LocalFile extends File {
}
JobQueueGroup::singleton()->lazyPush( $cacheUpdateJob );
} );
}, __METHOD__ );
return Status::newGood();
}

2
includes/installer/PostgresInstaller.php
View file

@ -689,7 +689,7 @@ class PostgresInstaller extends DatabaseInstaller {
__METHOD__ );
if ( $exists ) {
try {
$conn->query( 'CREATE LANGUAGE plpgsql' );
$conn->query( 'CREATE LANGUAGE plpgsql', __METHOD__ );
} catch ( DBQueryError $e ) {
return Status::newFatal( 'config-pg-no-plpgsql', $this->getVar( 'wgDBname' ) );
}

3
includes/installer/PostgresUpdater.php
View file

@ -1129,7 +1129,8 @@ END;
"JOIN pg_attribute a ON a.attrelid = i.indrelid " .
"AND a.attnum = ANY(i.indkey) " .
"WHERE i.indrelid = '\"$table\"'::regclass " .
"AND i.indisprimary"
"AND i.indisprimary",
__METHOD__
);
$currentColumns = [];
foreach ( $result as $row ) {

3
includes/libs/rdbms/field/PostgresField.php
View file

@ -43,7 +43,8 @@ SQL;
$db->addQuotes( $schema ),
$db->addQuotes( $table ),
$db->addQuotes( $field )
)
),
__METHOD__
);
$row = $db->fetchObject( $res );
if ( !$row ) {

4
includes/user/ActorStore.php
View file

@ -665,7 +665,9 @@ class ActorStore implements UserIdentityLookup, ActorNormalization {
$this->cache->remove( $cachedActor );
$this->detachActorId( $originalActor );
}
} );
},
__METHOD__
);
}
}

3
tests/phpunit/includes/Storage/NameTableStoreTest.php
View file

@ -448,7 +448,8 @@ class NameTableStoreTest extends MediaWikiIntegrationTestCase {
$this->db->onTransactionResolution(
static function () use ( $store1, &$quuxId ) {
$quuxId = $store1->acquireId( 'quux' );
}
},
__METHOD__
);
$store1->acquireId( 'foo' );

2
tests/phpunit/includes/filebackend/filejournal/DBFileJournalIntegrationTest.php
View file

@ -16,7 +16,7 @@ class DBFileJournalIntegrationTest extends MediaWikiIntegrationTestCase {
if ( $db->getType() !== 'mysql' ) {
return;
}
if ( !$db->tableExists( 'filejournal' ) ) {
if ( !$db->tableExists( 'filejournal', __METHOD__ ) ) {
$db->sourceFile( "$IP/maintenance/archives/patch-filejournal.sql" );
}
}