diff options
| -rw-r--r-- | includes/CommentStore/CommentStore.php | 2 | ||||
| -rw-r--r-- | includes/installer/MysqlUpdater.php | 1 | ||||
| -rw-r--r-- | includes/installer/PostgresUpdater.php | 1 | ||||
| -rw-r--r-- | includes/installer/SqliteUpdater.php | 1 | ||||
| -rw-r--r-- | tests/phpunit/includes/Revision/RevisionQueryInfoTest.php | 14 |
5 files changed, 6 insertions, 13 deletions
diff --git a/includes/CommentStore/CommentStore.php b/includes/CommentStore/CommentStore.php index de4b997f427a..4f1f5001ce53 100644 --- a/includes/CommentStore/CommentStore.php +++ b/includes/CommentStore/CommentStore.php @@ -57,7 +57,7 @@ class CommentStore extends CommentStoreBase { 'pk' => 'revcomment_rev', 'field' => 'revcomment_comment_id', 'joinPK' => 'rev_id', - 'stage' => MIGRATION_OLD, + 'stage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW, 'deprecatedIn' => null, ], ]; diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index 48288f90bbef..d8f93f1d075d 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -145,6 +145,7 @@ class MysqlUpdater extends DatabaseUpdater { // 1.41 [ 'addField', 'user', 'user_is_temp', 'patch-user-user_is_temp.sql' ], + [ 'runMaintenance', MigrateRevisionCommentTemp::class, 'maintenance/migrateRevisionCommentTemp.php' ], ]; } diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php index 6dbc84421db7..118cbd3a8d67 100644 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@ -450,6 +450,7 @@ class PostgresUpdater extends DatabaseUpdater { // 1.41 [ 'addField', 'user', 'user_is_temp', 'patch-user-user_is_temp.sql' ], + [ 'runMaintenance', MigrateRevisionCommentTemp::class, 'maintenance/migrateRevisionCommentTemp.php' ], ]; } diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 56b219763b41..439c4191b8e1 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -126,6 +126,7 @@ class SqliteUpdater extends DatabaseUpdater { // 1.41 [ 'addField', 'user', 'user_is_temp', 'patch-user-user_is_temp.sql' ], + [ 'runMaintenance', MigrateRevisionCommentTemp::class, 'maintenance/migrateRevisionCommentTemp.php' ], ]; } diff --git a/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php b/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php index b205861ff9cd..01068cc98de7 100644 --- a/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php +++ b/tests/phpunit/includes/Revision/RevisionQueryInfoTest.php @@ -144,7 +144,6 @@ class RevisionQueryInfoTest extends MediaWikiIntegrationTestCase { 'revision', 'page', 'user', - 'temp_rev_comment' => 'revision_comment_temp', 'actor_rev_user' => 'actor', 'comment_rev_comment' => 'comment', ], @@ -161,11 +160,7 @@ class RevisionQueryInfoTest extends MediaWikiIntegrationTestCase { 'LEFT JOIN', [ 'actor_rev_user.actor_user != 0', 'user_id = actor_rev_user.actor_user' ], ], - 'comment_rev_comment' => [ - 'JOIN', - 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id', - ], - 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ], + 'comment_rev_comment' => [ 'JOIN', 'comment_rev_comment.comment_id = rev_comment_id' ], 'actor_rev_user' => [ 'JOIN', 'actor_rev_user.actor_id = rev_actor' ] ], ] @@ -176,7 +171,6 @@ class RevisionQueryInfoTest extends MediaWikiIntegrationTestCase { [ 'tables' => [ 'revision', - 'temp_rev_comment' => 'revision_comment_temp', 'actor_rev_user' => 'actor', 'comment_rev_comment' => 'comment', ], @@ -186,11 +180,7 @@ class RevisionQueryInfoTest extends MediaWikiIntegrationTestCase { $this->getCommentQueryFields( 'rev' ) ), 'joins' => [ - 'comment_rev_comment' => [ - 'JOIN', - 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id', - ], - 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ], + 'comment_rev_comment' => [ 'JOIN', 'comment_rev_comment.comment_id = rev_comment_id' ], 'actor_rev_user' => [ 'JOIN', 'actor_rev_user.actor_id = rev_actor' ], ] ] |