X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FRevisionTest.php;h=3d0556ea3206df19b892d635f2799d396c372f5a;hb=d75c150177fbc2c5a818ee6735d41596bb631a8a;hp=ca8ed2bcc13748ec5b56bc5252c4d26828d6f454;hpb=85b49b0b73b470593ed2429d846e530efd60549b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php
index ca8ed2bcc1..3d0556ea32 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -34,6 +34,72 @@ class RevisionTest extends MediaWikiTestCase {
 		$this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContentModel() );
 	}
 
+	public function provideConstructFromArray_userSetAsExpected() {
+		yield 'no user defaults to wgUser' => [
+			[
+				'content' => new JavaScriptContent( 'hello world.' ),
+			],
+			null,
+			null,
+		];
+		yield 'user text and id' => [
+			[
+				'content' => new JavaScriptContent( 'hello world.' ),
+				'user_text' => 'SomeTextUserName',
+				'user' => 99,
+
+			],
+			99,
+			'SomeTextUserName',
+		];
+		// Note: the below XXX test cases are odd and probably result in unexpected behaviour if used
+		// in production code.
+		yield 'XXX: user text only' => [
+			[
+				'content' => new JavaScriptContent( 'hello world.' ),
+				'user_text' => '111.111.111.111',
+			],
+			null,
+			'111.111.111.111',
+		];
+		yield 'XXX: user id only' => [
+			[
+				'content' => new JavaScriptContent( 'hello world.' ),
+				'user' => 9989,
+			],
+			9989,
+			null,
+		];
+	}
+
+	/**
+	 * @dataProvider provideConstructFromArray_userSetAsExpected
+	 * @covers Revision::__construct
+	 * @covers Revision::constructFromRowArray
+	 *
+	 * @param array $rowArray
+	 * @param mixed $expectedUserId null to expect the current wgUser ID
+	 * @param mixed $expectedUserName null to expect the current wgUser name
+	 */
+	public function testConstructFromArray_userSetAsExpected(
+		array $rowArray,
+		$expectedUserId,
+		$expectedUserName
+	) {
+		$testUser = $this->getTestUser()->getUser();
+		$this->setMwGlobals( 'wgUser', $testUser );
+		if ( $expectedUserId === null ) {
+			$expectedUserId = $testUser->getId();
+		}
+		if ( $expectedUserName === null ) {
+			$expectedUserName = $testUser->getName();
+		}
+
+		$rev = new Revision( $rowArray );
+		$this->assertEquals( $expectedUserId, $rev->getUser() );
+		$this->assertEquals( $expectedUserName, $rev->getUserText() );
+	}
+
 	public function provideConstructFromArrayThrowsExceptions() {
 		yield 'content and text_id both not empty' => [
 			[
@@ -372,6 +438,7 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::fetchFromConds
 	 */
 	public function testFetchFromConds( $flags, array $options ) {
+		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
 		$conditions = [ 'conditionsArray' ];
 
 		$db = $this->getMock( IDatabase::class );
@@ -532,4 +599,762 @@ class RevisionTest extends MediaWikiTestCase {
 		);
 	}
 
+	/**
+	 * @covers Revision::getRevisionText
+	 */
+	public function testGetRevisionText_external_noOldId() {
+		$this->setService(
+			'ExternalStoreFactory',
+			new ExternalStoreFactory( [ 'ForTesting' ] )
+		);
+		$this->assertSame(
+			'AAAABBAAA',
+			Revision::getRevisionText(
+				(object)[
+					'old_text' => 'ForTesting://cluster1/12345',
+					'old_flags' => 'external,gzip',
+				]
+			)
+		);
+	}
+
+	/**
+	 * @covers Revision::getRevisionText
+	 */
+	public function testGetRevisionText_external_oldId() {
+		$cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] );
+		$this->setService( 'MainWANObjectCache', $cache );
+		$this->setService(
+			'ExternalStoreFactory',
+			new ExternalStoreFactory( [ 'ForTesting' ] )
+		);
+
+		$cacheKey = $cache->makeKey( 'revisiontext', 'textid', '7777' );
+
+		$this->assertSame(
+			'AAAABBAAA',
+			Revision::getRevisionText(
+				(object)[
+					'old_text' => 'ForTesting://cluster1/12345',
+					'old_flags' => 'external,gzip',
+					'old_id' => '7777',
+				]
+			)
+		);
+		$this->assertSame( 'AAAABBAAA', $cache->get( $cacheKey ) );
+	}
+
+	/**
+	 * @covers Revision::userJoinCond
+	 */
+	public function testUserJoinCond() {
+		$this->hideDeprecated( 'Revision::userJoinCond' );
+		$this->assertEquals(
+			[ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ],
+			Revision::userJoinCond()
+		);
+	}
+
+	/**
+	 * @covers Revision::pageJoinCond
+	 */
+	public function testPageJoinCond() {
+		$this->hideDeprecated( 'Revision::pageJoinCond' );
+		$this->assertEquals(
+			[ 'INNER JOIN', [ 'page_id = rev_page' ] ],
+			Revision::pageJoinCond()
+		);
+	}
+
+	public function provideSelectFields() {
+		yield [
+			true,
+			[
+				'rev_id',
+				'rev_page',
+				'rev_text_id',
+				'rev_timestamp',
+				'rev_user_text',
+				'rev_user',
+				'rev_minor_edit',
+				'rev_deleted',
+				'rev_len',
+				'rev_parent_id',
+				'rev_sha1',
+				'rev_comment_text' => 'rev_comment',
+				'rev_comment_data' => 'NULL',
+				'rev_comment_cid' => 'NULL',
+				'rev_content_format',
+				'rev_content_model',
+			]
+		];
+		yield [
+			false,
+			[
+				'rev_id',
+				'rev_page',
+				'rev_text_id',
+				'rev_timestamp',
+				'rev_user_text',
+				'rev_user',
+				'rev_minor_edit',
+				'rev_deleted',
+				'rev_len',
+				'rev_parent_id',
+				'rev_sha1',
+				'rev_comment_text' => 'rev_comment',
+				'rev_comment_data' => 'NULL',
+				'rev_comment_cid' => 'NULL',
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider provideSelectFields
+	 * @covers Revision::selectFields
+	 * @todo a true unit test would mock CommentStore
+	 */
+	public function testSelectFields( $contentHandlerUseDB, $expected ) {
+		$this->hideDeprecated( 'Revision::selectFields' );
+		$this->setMwGlobals( 'wgContentHandlerUseDB', $contentHandlerUseDB );
+		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
+		$this->assertEquals( $expected, Revision::selectFields() );
+	}
+
+	public function provideSelectArchiveFields() {
+		yield [
+			true,
+			[
+				'ar_id',
+				'ar_page_id',
+				'ar_rev_id',
+				'ar_text',
+				'ar_text_id',
+				'ar_timestamp',
+				'ar_user_text',
+				'ar_user',
+				'ar_minor_edit',
+				'ar_deleted',
+				'ar_len',
+				'ar_parent_id',
+				'ar_sha1',
+				'ar_comment_text' => 'ar_comment',
+				'ar_comment_data' => 'NULL',
+				'ar_comment_cid' => 'NULL',
+				'ar_content_format',
+				'ar_content_model',
+			]
+		];
+		yield [
+			false,
+			[
+				'ar_id',
+				'ar_page_id',
+				'ar_rev_id',
+				'ar_text',
+				'ar_text_id',
+				'ar_timestamp',
+				'ar_user_text',
+				'ar_user',
+				'ar_minor_edit',
+				'ar_deleted',
+				'ar_len',
+				'ar_parent_id',
+				'ar_sha1',
+				'ar_comment_text' => 'ar_comment',
+				'ar_comment_data' => 'NULL',
+				'ar_comment_cid' => 'NULL',
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider provideSelectArchiveFields
+	 * @covers Revision::selectArchiveFields
+	 * @todo a true unit test would mock CommentStore
+	 */
+	public function testSelectArchiveFields( $contentHandlerUseDB, $expected ) {
+		$this->hideDeprecated( 'Revision::selectArchiveFields' );
+		$this->setMwGlobals( 'wgContentHandlerUseDB', $contentHandlerUseDB );
+		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
+		$this->assertEquals( $expected, Revision::selectArchiveFields() );
+	}
+
+	/**
+	 * @covers Revision::selectTextFields
+	 */
+	public function testSelectTextFields() {
+		$this->hideDeprecated( 'Revision::selectTextFields' );
+		$this->assertEquals(
+			[
+				'old_text',
+				'old_flags',
+			],
+			Revision::selectTextFields()
+		);
+	}
+
+	/**
+	 * @covers Revision::selectPageFields
+	 */
+	public function testSelectPageFields() {
+		$this->hideDeprecated( 'Revision::selectPageFields' );
+		$this->assertEquals(
+			[
+				'page_namespace',
+				'page_title',
+				'page_id',
+				'page_latest',
+				'page_is_redirect',
+				'page_len',
+			],
+			Revision::selectPageFields()
+		);
+	}
+
+	/**
+	 * @covers Revision::selectUserFields
+	 */
+	public function testSelectUserFields() {
+		$this->hideDeprecated( 'Revision::selectUserFields' );
+		$this->assertEquals(
+			[
+				'user_name',
+			],
+			Revision::selectUserFields()
+		);
+	}
+
+	public function provideGetArchiveQueryInfo() {
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
+			],
+			[
+				'tables' => [ 'archive' ],
+				'fields' => [
+					'ar_id',
+					'ar_page_id',
+					'ar_rev_id',
+					'ar_text',
+					'ar_text_id',
+					'ar_timestamp',
+					'ar_user_text',
+					'ar_user',
+					'ar_minor_edit',
+					'ar_deleted',
+					'ar_len',
+					'ar_parent_id',
+					'ar_sha1',
+					'ar_comment_text' => 'ar_comment',
+					'ar_comment_data' => 'NULL',
+					'ar_comment_cid' => 'NULL',
+				],
+				'joins' => [],
+			]
+		];
+		yield 'wgContentHandlerUseDB true, wgCommentTableSchemaMigrationStage OLD' => [
+			[
+				'wgContentHandlerUseDB' => true,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
+			],
+			[
+				'tables' => [ 'archive' ],
+				'fields' => [
+					'ar_id',
+					'ar_page_id',
+					'ar_rev_id',
+					'ar_text',
+					'ar_text_id',
+					'ar_timestamp',
+					'ar_user_text',
+					'ar_user',
+					'ar_minor_edit',
+					'ar_deleted',
+					'ar_len',
+					'ar_parent_id',
+					'ar_sha1',
+					'ar_comment_text' => 'ar_comment',
+					'ar_comment_data' => 'NULL',
+					'ar_comment_cid' => 'NULL',
+					'ar_content_format',
+					'ar_content_model',
+				],
+				'joins' => [],
+			]
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage WRITE_BOTH' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
+			],
+			[
+				'tables' => [
+					'archive',
+					'comment_ar_comment' => 'comment',
+				],
+				'fields' => [
+					'ar_id',
+					'ar_page_id',
+					'ar_rev_id',
+					'ar_text',
+					'ar_text_id',
+					'ar_timestamp',
+					'ar_user_text',
+					'ar_user',
+					'ar_minor_edit',
+					'ar_deleted',
+					'ar_len',
+					'ar_parent_id',
+					'ar_sha1',
+					'ar_comment_text' => 'COALESCE( comment_ar_comment.comment_text, ar_comment )',
+					'ar_comment_data' => 'comment_ar_comment.comment_data',
+					'ar_comment_cid' => 'comment_ar_comment.comment_id',
+				],
+				'joins' => [
+					'comment_ar_comment' => [
+						'LEFT JOIN',
+						'comment_ar_comment.comment_id = ar_comment_id',
+					],
+				],
+			]
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage WRITE_NEW' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
+			],
+			[
+				'tables' => [
+					'archive',
+					'comment_ar_comment' => 'comment',
+				],
+				'fields' => [
+					'ar_id',
+					'ar_page_id',
+					'ar_rev_id',
+					'ar_text',
+					'ar_text_id',
+					'ar_timestamp',
+					'ar_user_text',
+					'ar_user',
+					'ar_minor_edit',
+					'ar_deleted',
+					'ar_len',
+					'ar_parent_id',
+					'ar_sha1',
+					'ar_comment_text' => 'COALESCE( comment_ar_comment.comment_text, ar_comment )',
+					'ar_comment_data' => 'comment_ar_comment.comment_data',
+					'ar_comment_cid' => 'comment_ar_comment.comment_id',
+				],
+				'joins' => [
+					'comment_ar_comment' => [
+						'LEFT JOIN',
+						'comment_ar_comment.comment_id = ar_comment_id',
+					],
+				],
+			]
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage NEW' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW,
+			],
+			[
+				'tables' => [
+					'archive',
+					'comment_ar_comment' => 'comment',
+				],
+				'fields' => [
+					'ar_id',
+					'ar_page_id',
+					'ar_rev_id',
+					'ar_text',
+					'ar_text_id',
+					'ar_timestamp',
+					'ar_user_text',
+					'ar_user',
+					'ar_minor_edit',
+					'ar_deleted',
+					'ar_len',
+					'ar_parent_id',
+					'ar_sha1',
+					'ar_comment_text' => 'comment_ar_comment.comment_text',
+					'ar_comment_data' => 'comment_ar_comment.comment_data',
+					'ar_comment_cid' => 'comment_ar_comment.comment_id',
+				],
+				'joins' => [
+					'comment_ar_comment' => [
+						'JOIN',
+						'comment_ar_comment.comment_id = ar_comment_id',
+					],
+				],
+			]
+		];
+	}
+
+	/**
+	 * @covers Revision::getArchiveQueryInfo
+	 * @dataProvider provideGetArchiveQueryInfo
+	 */
+	public function testGetArchiveQueryInfo( $globals, $expected ) {
+		$this->setMwGlobals( $globals );
+		$this->assertEquals(
+			$expected,
+			Revision::getArchiveQueryInfo()
+		);
+	}
+
+	public function provideGetQueryInfo() {
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts none' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
+			],
+			[],
+			[
+				'tables' => [ 'revision' ],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'rev_comment',
+					'rev_comment_data' => 'NULL',
+					'rev_comment_cid' => 'NULL',
+				],
+				'joins' => [],
+			],
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts page' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
+			],
+			[ 'page' ],
+			[
+				'tables' => [ 'revision', 'page' ],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'rev_comment',
+					'rev_comment_data' => 'NULL',
+					'rev_comment_cid' => 'NULL',
+					'page_namespace',
+					'page_title',
+					'page_id',
+					'page_latest',
+					'page_is_redirect',
+					'page_len',
+				],
+				'joins' => [
+					'page' => [
+						'INNER JOIN',
+						[ 'page_id = rev_page' ],
+					],
+				],
+			],
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts user' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
+			],
+			[ 'user' ],
+			[
+				'tables' => [ 'revision', 'user' ],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'rev_comment',
+					'rev_comment_data' => 'NULL',
+					'rev_comment_cid' => 'NULL',
+					'user_name',
+				],
+				'joins' => [
+					'user' => [
+						'LEFT JOIN',
+						[
+							'rev_user != 0',
+							'user_id = rev_user',
+						],
+					],
+				],
+			],
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts text' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
+			],
+			[ 'text' ],
+			[
+				'tables' => [ 'revision', 'text' ],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'rev_comment',
+					'rev_comment_data' => 'NULL',
+					'rev_comment_cid' => 'NULL',
+					'old_text',
+					'old_flags',
+				],
+				'joins' => [
+					'text' => [
+						'INNER JOIN',
+						[ 'rev_text_id=old_id' ],
+					],
+				],
+			],
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts 3' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
+			],
+			[ 'text', 'page', 'user' ],
+			[
+				'tables' => [ 'revision', 'page', 'user', 'text' ],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'rev_comment',
+					'rev_comment_data' => 'NULL',
+					'rev_comment_cid' => 'NULL',
+					'page_namespace',
+					'page_title',
+					'page_id',
+					'page_latest',
+					'page_is_redirect',
+					'page_len',
+					'user_name',
+					'old_text',
+					'old_flags',
+				],
+				'joins' => [
+					'page' => [
+						'INNER JOIN',
+						[ 'page_id = rev_page' ],
+					],
+					'user' => [
+						'LEFT JOIN',
+						[
+							'rev_user != 0',
+							'user_id = rev_user',
+						],
+					],
+					'text' => [
+						'INNER JOIN',
+						[ 'rev_text_id=old_id' ],
+					],
+				],
+			],
+		];
+		yield 'wgContentHandlerUseDB true, wgCommentTableSchemaMigrationStage OLD, opts none' => [
+			[
+				'wgContentHandlerUseDB' => true,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
+			],
+			[],
+			[
+				'tables' => [ 'revision' ],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'rev_comment',
+					'rev_comment_data' => 'NULL',
+					'rev_comment_cid' => 'NULL',
+					'rev_content_format',
+					'rev_content_model',
+				],
+				'joins' => [],
+			],
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage WRITE_BOTH, opts none' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
+			],
+			[],
+			[
+				'tables' => [
+					'revision',
+					'temp_rev_comment' => 'revision_comment_temp',
+					'comment_rev_comment' => 'comment',
+				],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'COALESCE( comment_rev_comment.comment_text, rev_comment )',
+					'rev_comment_data' => 'comment_rev_comment.comment_data',
+					'rev_comment_cid' => 'comment_rev_comment.comment_id',
+				],
+				'joins' => [
+					'temp_rev_comment' => [
+						'LEFT JOIN',
+						'temp_rev_comment.revcomment_rev = rev_id',
+					],
+					'comment_rev_comment' => [
+						'LEFT JOIN',
+						'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id',
+					],
+				],
+			],
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage WRITE_NEW, opts none' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
+			],
+			[],
+			[
+				'tables' => [
+					'revision',
+					'temp_rev_comment' => 'revision_comment_temp',
+					'comment_rev_comment' => 'comment',
+				],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'COALESCE( comment_rev_comment.comment_text, rev_comment )',
+					'rev_comment_data' => 'comment_rev_comment.comment_data',
+					'rev_comment_cid' => 'comment_rev_comment.comment_id',
+				],
+				'joins' => [
+					'temp_rev_comment' => [
+						'LEFT JOIN',
+						'temp_rev_comment.revcomment_rev = rev_id',
+					],
+					'comment_rev_comment' => [
+						'LEFT JOIN',
+						'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id',
+					],
+				],
+			],
+		];
+		yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage NEW, opts none' => [
+			[
+				'wgContentHandlerUseDB' => false,
+				'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW,
+			],
+			[],
+			[
+				'tables' => [
+					'revision',
+					'temp_rev_comment' => 'revision_comment_temp',
+					'comment_rev_comment' => 'comment',
+				],
+				'fields' => [
+					'rev_id',
+					'rev_page',
+					'rev_text_id',
+					'rev_timestamp',
+					'rev_user_text',
+					'rev_user',
+					'rev_minor_edit',
+					'rev_deleted',
+					'rev_len',
+					'rev_parent_id',
+					'rev_sha1',
+					'rev_comment_text' => 'comment_rev_comment.comment_text',
+					'rev_comment_data' => 'comment_rev_comment.comment_data',
+					'rev_comment_cid' => 'comment_rev_comment.comment_id',
+				],
+				'joins' => [
+					'temp_rev_comment' => [
+						'JOIN',
+						'temp_rev_comment.revcomment_rev = rev_id',
+					],
+					'comment_rev_comment' => [
+						'JOIN',
+						'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id',
+					],
+				],
+			],
+		];
+	}
+
+	/**
+	 * @covers Revision::getQueryInfo
+	 * @dataProvider provideGetQueryInfo
+	 */
+	public function testGetQueryInfo( $globals, $options, $expected ) {
+		$this->setMwGlobals( $globals );
+		$this->assertEquals(
+			$expected,
+			Revision::getQueryInfo( $options )
+		);
+	}
+
 }