Merge pull request #20815 from civicrm/5.40

5.40 to master
civicrm · Jul 8, 2021 · 09e790b · 09e790b
2 parents f87ae74 + 3efec37
commit 09e790b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/CRM/Upgrade/Incremental/php/FiveForty.php b/CRM/Upgrade/Incremental/php/FiveForty.php
@@ -91,6 +91,8 @@ public static function addGroupOptionList(CRM_Queue_TaskContext $ctx) {
    */
   public static function addContributionProductFK(CRM_Queue_TaskContext $ctx): bool {
     if (!self::checkFKExists('civicrm_contribution_product', 'FK_civicrm_contribution_product_product_id')) {
+      // dev/core#2680 Clear out any rows with problematic product_ids from the civicrm_contribution_product table.
+      CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contribution_product WHERE product_id NOT IN (SELECT id FROM civicrm_product)");
       CRM_Core_DAO::executeQuery("
         ALTER TABLE `civicrm_contribution_product`
           ADD CONSTRAINT `FK_civicrm_contribution_product_product_id`