During development a lot of classes were placed in MediaWiki\Storage\. The precedent set would mean that every class relating to something stored in a database table, plus all related value classes and such, would go into that namespace. Let's put them into MediaWiki\Revision\ instead. Then future classes related to the 'page' table can go into MediaWiki\Page\, future classes related to the 'user' table can go into MediaWiki\User\, and so on. Note I didn't move DerivedPageDataUpdater, PageUpdateException, PageUpdater, or RevisionSlotsUpdate in this patch. If these are kept long-term, they probably belong in MediaWiki\Page\ or MediaWiki\Edit\ instead. Bug: T204158 Change-Id: I16bea8927566a3c73c07e4f4afb3537e05aa04a5
189 lines
5.2 KiB
PHP
189 lines
5.2 KiB
PHP
<?php
|
|
namespace MediaWiki\Tests\Revision;
|
|
|
|
use CommentStoreComment;
|
|
use MediaWiki\MediaWikiServices;
|
|
use MediaWiki\Revision\MutableRevisionRecord;
|
|
use MediaWiki\Revision\RevisionRecord;
|
|
use MediaWiki\Revision\SlotRecord;
|
|
use TextContent;
|
|
use Title;
|
|
use WikitextContent;
|
|
|
|
/**
|
|
* Tests RevisionStore against the post-migration MCR DB schema.
|
|
*
|
|
* @covers \MediaWiki\Revision\RevisionStore
|
|
*
|
|
* @group RevisionStore
|
|
* @group Storage
|
|
* @group Database
|
|
* @group medium
|
|
*/
|
|
class McrRevisionStoreDbTest extends RevisionStoreDbTestBase {
|
|
|
|
use McrSchemaOverride;
|
|
|
|
protected function assertRevisionExistsInDatabase( RevisionRecord $rev ) {
|
|
$numberOfSlots = count( $rev->getSlotRoles() );
|
|
|
|
// new schema is written
|
|
$this->assertSelect(
|
|
'slots',
|
|
[ 'count(*)' ],
|
|
[ 'slot_revision_id' => $rev->getId() ],
|
|
[ [ (string)$numberOfSlots ] ]
|
|
);
|
|
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
$revQuery = $store->getSlotsQueryInfo( [ 'content' ] );
|
|
|
|
$this->assertSelect(
|
|
$revQuery['tables'],
|
|
[ 'count(*)' ],
|
|
[
|
|
'slot_revision_id' => $rev->getId(),
|
|
],
|
|
[ [ (string)$numberOfSlots ] ],
|
|
[],
|
|
$revQuery['joins']
|
|
);
|
|
|
|
parent::assertRevisionExistsInDatabase( $rev );
|
|
}
|
|
|
|
/**
|
|
* @param SlotRecord $a
|
|
* @param SlotRecord $b
|
|
*/
|
|
protected function assertSameSlotContent( SlotRecord $a, SlotRecord $b ) {
|
|
parent::assertSameSlotContent( $a, $b );
|
|
|
|
// Assert that the same content ID has been used
|
|
$this->assertSame( $a->getContentId(), $b->getContentId() );
|
|
}
|
|
|
|
public function provideInsertRevisionOn_successes() {
|
|
foreach ( parent::provideInsertRevisionOn_successes() as $case ) {
|
|
yield $case;
|
|
}
|
|
|
|
yield 'Multi-slot revision insertion' => [
|
|
[
|
|
'content' => [
|
|
'main' => new WikitextContent( 'Chicken' ),
|
|
'aux' => new TextContent( 'Egg' ),
|
|
],
|
|
'page' => true,
|
|
'comment' => $this->getRandomCommentStoreComment(),
|
|
'timestamp' => '20171117010101',
|
|
'user' => true,
|
|
],
|
|
];
|
|
}
|
|
|
|
public function provideNewNullRevision() {
|
|
foreach ( parent::provideNewNullRevision() as $case ) {
|
|
yield $case;
|
|
}
|
|
|
|
yield [
|
|
Title::newFromText( 'UTPage_notAutoCreated' ),
|
|
[
|
|
'content' => [
|
|
'main' => new WikitextContent( 'Chicken' ),
|
|
'aux' => new WikitextContent( 'Omelet' ),
|
|
],
|
|
],
|
|
CommentStoreComment::newUnsavedComment( __METHOD__ . ' comment multi' ),
|
|
];
|
|
}
|
|
|
|
public function provideNewMutableRevisionFromArray() {
|
|
foreach ( parent::provideNewMutableRevisionFromArray() as $case ) {
|
|
yield $case;
|
|
}
|
|
|
|
yield 'Basic array, multiple roles' => [
|
|
[
|
|
'id' => 2,
|
|
'page' => 1,
|
|
'timestamp' => '20171017114835',
|
|
'user_text' => '111.0.1.2',
|
|
'user' => 0,
|
|
'minor_edit' => false,
|
|
'deleted' => 0,
|
|
'len' => 29,
|
|
'parent_id' => 1,
|
|
'sha1' => '89qs83keq9c9ccw9olvvm4oc9oq50ii',
|
|
'comment' => 'Goat Comment!',
|
|
'content' => [
|
|
'main' => new WikitextContent( 'Söme Cöntent' ),
|
|
'aux' => new TextContent( 'Öther Cöntent' ),
|
|
]
|
|
]
|
|
];
|
|
}
|
|
|
|
public function testGetQueryInfo_NoSlotDataJoin() {
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
$queryInfo = $store->getQueryInfo();
|
|
|
|
// with the new schema enabled, query info should not join the main slot info
|
|
$this->assertFalse( array_key_exists( 'a_slot_data', $queryInfo['tables'] ) );
|
|
$this->assertFalse( array_key_exists( 'a_slot_data', $queryInfo['joins'] ) );
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Revision\RevisionStore::insertRevisionOn
|
|
* @covers \MediaWiki\Revision\RevisionStore::insertSlotRowOn
|
|
* @covers \MediaWiki\Revision\RevisionStore::insertContentRowOn
|
|
*/
|
|
public function testInsertRevisionOn_T202032() {
|
|
// This test only makes sense for MySQL
|
|
if ( $this->db->getType() !== 'mysql' ) {
|
|
$this->assertTrue( true );
|
|
return;
|
|
}
|
|
|
|
// NOTE: must be done before checking MAX(rev_id)
|
|
$page = $this->getTestPage();
|
|
|
|
$maxRevId = $this->db->selectField( 'revision', 'MAX(rev_id)' );
|
|
|
|
// Construct a slot row that will conflict with the insertion of the next revision ID,
|
|
// to emulate the failure mode described in T202032. Nothing will ever read this row,
|
|
// we just need it to trigger a primary key conflict.
|
|
$this->db->insert( 'slots', [
|
|
'slot_revision_id' => $maxRevId + 1,
|
|
'slot_role_id' => 1,
|
|
'slot_content_id' => 0,
|
|
'slot_origin' => 0
|
|
], __METHOD__ );
|
|
|
|
$rev = new MutableRevisionRecord( $page->getTitle() );
|
|
$rev->setTimestamp( '20180101000000' );
|
|
$rev->setComment( CommentStoreComment::newUnsavedComment( 'test' ) );
|
|
$rev->setUser( $this->getTestUser()->getUser() );
|
|
$rev->setContent( 'main', new WikitextContent( 'Text' ) );
|
|
$rev->setPageId( $page->getId() );
|
|
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
$return = $store->insertRevisionOn( $rev, $this->db );
|
|
|
|
$this->assertSame( $maxRevId + 2, $return->getId() );
|
|
|
|
// is the new revision correct?
|
|
$this->assertRevisionCompleteness( $return );
|
|
$this->assertRevisionRecordsEqual( $rev, $return );
|
|
|
|
// can we find it directly in the database?
|
|
$this->assertRevisionExistsInDatabase( $return );
|
|
|
|
// can we load it from the store?
|
|
$loaded = $store->getRevisionById( $return->getId() );
|
|
$this->assertRevisionCompleteness( $loaded );
|
|
$this->assertRevisionRecordsEqual( $return, $loaded );
|
|
}
|
|
|
|
}
|