c29909e59f
This removes most of the pre-actor user and user_text columns, and the $wgActorTableSchemaMigrationStage setting that used to determine whether the columns were used. rev_user and rev_user_text remain in the code, as on Wikimedia wikis the revision table is too large to alter at this time. A future change will combine that with the removal of rev_comment, rev_content_model, and rev_content_format (and the addition of rev_comment_id and rev_actor). ActorMigration's constructor continues to take a $stage parameter, and continues to have the logic for handling it, for the benefit of extensions that might need their own migration process. Code using ActorMigration for accessing the core fields should be updated to use the new actor fields directly. That will be done for in a followup. Bug: T188327 Change-Id: Id35544b879af1cd708f3efd303fce8d9a1b9eb02
128 lines
3.3 KiB
PHP
128 lines
3.3 KiB
PHP
<?php
|
|
|
|
use MediaWiki\MediaWikiServices;
|
|
use Wikimedia\Rdbms\IDatabase;
|
|
|
|
class DatabaseLogEntryTest extends MediaWikiTestCase {
|
|
public function setUp() {
|
|
parent::setUp();
|
|
|
|
// These services cache their joins
|
|
MediaWikiServices::getInstance()->resetServiceForTesting( 'CommentStore' );
|
|
MediaWikiServices::getInstance()->resetServiceForTesting( 'ActorMigration' );
|
|
}
|
|
|
|
public function tearDown() {
|
|
parent::tearDown();
|
|
|
|
MediaWikiServices::getInstance()->resetServiceForTesting( 'CommentStore' );
|
|
MediaWikiServices::getInstance()->resetServiceForTesting( 'ActorMigration' );
|
|
}
|
|
|
|
/**
|
|
* @covers DatabaseLogEntry::newFromId
|
|
* @covers DatabaseLogEntry::getSelectQueryData
|
|
*
|
|
* @dataProvider provideNewFromId
|
|
*
|
|
* @param int $id
|
|
* @param array $selectFields
|
|
* @param string[]|null $row
|
|
* @param string[]|null $expectedFields
|
|
*/
|
|
public function testNewFromId( $id,
|
|
array $selectFields,
|
|
array $row = null,
|
|
array $expectedFields = null
|
|
) {
|
|
$row = $row ? (object)$row : null;
|
|
$db = $this->getMock( IDatabase::class );
|
|
$db->expects( self::once() )
|
|
->method( 'selectRow' )
|
|
->with( $selectFields['tables'],
|
|
$selectFields['fields'],
|
|
$selectFields['conds'],
|
|
'DatabaseLogEntry::newFromId',
|
|
$selectFields['options'],
|
|
$selectFields['join_conds']
|
|
)
|
|
->will( self::returnValue( $row ) );
|
|
|
|
/** @var IDatabase $db */
|
|
$logEntry = DatabaseLogEntry::newFromId( $id, $db );
|
|
|
|
if ( !$expectedFields ) {
|
|
self::assertNull( $logEntry, "Expected no log entry returned for id=$id" );
|
|
} else {
|
|
self::assertEquals( $id, $logEntry->getId() );
|
|
self::assertEquals( $expectedFields['type'], $logEntry->getType() );
|
|
self::assertEquals( $expectedFields['comment'], $logEntry->getComment() );
|
|
}
|
|
}
|
|
|
|
public function provideNewFromId() {
|
|
$newTables = [
|
|
'tables' => [
|
|
'logging',
|
|
'user',
|
|
'comment_log_comment' => 'comment',
|
|
'actor_log_user' => 'actor'
|
|
],
|
|
'fields' => [
|
|
'log_id',
|
|
'log_type',
|
|
'log_action',
|
|
'log_timestamp',
|
|
'log_namespace',
|
|
'log_title',
|
|
'log_params',
|
|
'log_deleted',
|
|
'user_id',
|
|
'user_name',
|
|
'user_editcount',
|
|
'log_comment_text' => 'comment_log_comment.comment_text',
|
|
'log_comment_data' => 'comment_log_comment.comment_data',
|
|
'log_comment_cid' => 'comment_log_comment.comment_id',
|
|
'log_user' => 'actor_log_user.actor_user',
|
|
'log_user_text' => 'actor_log_user.actor_name',
|
|
'log_actor' => 'log_actor',
|
|
],
|
|
'options' => [],
|
|
'join_conds' => [
|
|
'user' => [ 'LEFT JOIN', 'user_id=actor_log_user.actor_user' ],
|
|
'comment_log_comment' => [ 'JOIN', 'comment_log_comment.comment_id = log_comment_id' ],
|
|
'actor_log_user' => [ 'JOIN', 'actor_log_user.actor_id = log_actor' ],
|
|
],
|
|
];
|
|
return [
|
|
[
|
|
0,
|
|
$newTables + [ 'conds' => [ 'log_id' => 0 ] ],
|
|
null,
|
|
null
|
|
],
|
|
[
|
|
123,
|
|
$newTables + [ 'conds' => [ 'log_id' => 123 ] ],
|
|
[
|
|
'log_id' => 123,
|
|
'log_type' => 'foobarize',
|
|
'log_comment_text' => 'test!',
|
|
'log_comment_data' => null,
|
|
],
|
|
[ 'type' => 'foobarize', 'comment' => 'test!' ]
|
|
],
|
|
[
|
|
567,
|
|
$newTables + [ 'conds' => [ 'log_id' => 567 ] ],
|
|
[
|
|
'log_id' => 567,
|
|
'log_type' => 'foobarize',
|
|
'log_comment_text' => 'test!',
|
|
'log_comment_data' => null,
|
|
],
|
|
[ 'type' => 'foobarize', 'comment' => 'test!' ]
|
|
],
|
|
];
|
|
}
|
|
}
|