wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-12-11 23:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix installer error when the task is run a second time

Browse source 
Fix task idempotency. Check if a table exists before running the schema
patch.

Bug: T352113
Change-Id: If6f0930ea327df35fe118d4a08993c6383f9d579
This commit is contained in:
Tim Starling 2024-11-28 14:54:42 +11:00
parent 441ca70fbf
commit 105f2a3845
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/InstallSchemaTask.php
View file

@ -33,10 +33,11 @@ class InstallSchemaTask extends Task {
} }
public function execute(): Status { public function execute(): Status {
$status = Status::newGood();
$cluster = $this->getConfigVar( 'EchoCluster' ); $cluster = $this->getConfigVar( 'EchoCluster' );
if ( !$cluster ) { if ( !$cluster ) {
// This case is adequately handled by LoadExtensionSchemaUpdates // This case is adequately handled by LoadExtensionSchemaUpdates
return Status::newGood(); return $status;
} }
// Get the load balancer // Get the load balancer
@ -54,7 +55,10 @@ class InstallSchemaTask extends Task {
// Create tables // Create tables
$dbw = $echoLB->getMaintenanceConnectionRef( DB_PRIMARY ); $dbw = $echoLB->getMaintenanceConnectionRef( DB_PRIMARY );
$dbw->setSchemaVars( $this->getContext()->getSchemaVars() ); $dbw->setSchemaVars( $this->getContext()->getSchemaVars() );
return $this->applySourceFile( $dbw, 'tables-generated.sql' ); if ( !$dbw->tableExists( 'echo_event' ) ) {
$status = $this->applySourceFile( $dbw, 'tables-generated.sql' );
}
return $status;
} }
} }