wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-12-18 10:52:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

removeOrphanedEvents.php: Don't remove events waiting to be emailed

Browse source 
echo_notification isn't the only table that refers to echo_event;
echo_email_batch does too, so check it as well.

Change-Id: I6663c8bb83a991ee663eb1616583fde8eee46751
This commit is contained in:
Roan Kattouw 2019-04-12 15:32:56 -07:00
parent 61a839315a
commit df068ba075
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
maintenance/removeOrphanedEvents.php
View file

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Remove rows from echo_event that don't have corresponding rows in echo_notification. * Remove rows from echo_event that don't have corresponding rows in echo_notification or echo_email_batch.
* *
* @ingroup Maintenance * @ingroup Maintenance
*/ */
@ -18,7 +18,7 @@ class RemoveOrphanedEvents extends LoggedUpdateMaintenance {
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
$this->addDescription( "Remove rows from echo_event that don't have corresponding rows in echo_notification" ); $this->addDescription( "Remove rows from echo_event that don't have corresponding rows in echo_notification or echo_email_batch" );
$this->setBatchSize( 500 ); $this->setBatchSize( 500 );
@ -35,15 +35,17 @@ class RemoveOrphanedEvents extends LoggedUpdateMaintenance {
$dbr = $dbFactory->getEchoDb( DB_REPLICA ); $dbr = $dbFactory->getEchoDb( DB_REPLICA );
$iterator = new BatchRowIterator( $iterator = new BatchRowIterator(
$dbr, $dbr,
[ 'echo_event', 'echo_notification' ], [ 'echo_event', 'echo_notification', 'echo_email_batch' ],
'event_id', 'event_id',
$this->mBatchSize $this->mBatchSize
); );
$iterator->addJoinConditions( [ $iterator->addJoinConditions( [
'echo_notification' => [ 'LEFT JOIN', 'notification_event=event_id' ] 'echo_notification' => [ 'LEFT JOIN', 'notification_event=event_id' ],
'echo_email_batch' => [ 'LEFT JOIN', 'eeb_event_id=event_id' ],
] ); ] );
$iterator->addConditions( [ $iterator->addConditions( [
'notification_user' => null 'notification_user' => null,
'eeb_user_id' => null,
] ); ] );
$this->output( "Removing orphaned echo_event rows...\n" ); $this->output( "Removing orphaned echo_event rows...\n" );