jenkins-bot has submitted this change and it was merged.
Change subject: PostgreSQL: Improve dropping of foreign key constraint
......................................................................
PostgreSQL: Improve dropping of foreign key constraint
Change I2abd650c8ce83c5b725aec054 to fix bug T76254 was
inefficient upon subsequent updates, as update.php would
first add the constraint, and then remove it again.
Remove the older code responsible for adding the doomed
constraint.
Also, make the "do nothing" output message more consistent
with other messages of the same nature.
Change-Id: Id6a05c1234fbdc5849480d13fb7d6476eac52857
(cherry picked from commit 13fafa519207292f5355606579704b2fd3f88e51)
---
M includes/installer/PostgresUpdater.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/PostgresUpdater.php
b/includes/installer/PostgresUpdater.php
index d9608b6..df2f0e3 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -384,8 +384,6 @@
'page(page_id) ON DELETE CASCADE' ),
array( 'changeFkeyDeferrable', 'protected_titles',
'pt_user',
'mwuser(user_id) ON DELETE SET NULL' ),
- array( 'changeFkeyDeferrable', 'recentchanges',
'rc_cur_id',
- 'page(page_id) ON DELETE SET NULL' ),
array( 'changeFkeyDeferrable', 'recentchanges',
'rc_user',
'mwuser(user_id) ON DELETE SET NULL' ),
array( 'changeFkeyDeferrable', 'redirect', 'rd_from',
'page(page_id) ON DELETE CASCADE' ),
@@ -787,7 +785,7 @@
$command = "ALTER TABLE $table DROP CONSTRAINT
$conname";
$this->db->query( $command );
} else {
- $this->output( "Foreign key constraint on
'$table.$field' already does not exist\n" );
+ $this->output( "...foreign key constraint on
'$table.$field' already does not exist\n" );
};
}
--
To view, visit https://gerrit.wikimedia.org/r/191258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6a05c1234fbdc5849480d13fb7d6476eac52857
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_24
Gerrit-Owner: Jjanes <[email protected]>
Gerrit-Reviewer: Jjanes <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Waldir <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
