dev/core#2680 Remove rows in the civicrm_contribution_product table that have bad...

diff --git a/CRM/Upgrade/Incremental/php/FiveForty.php b/CRM/Upgrade/Incremental/php/FiveForty.php
index 9a69df58288b4dd5998bf43cd0f498f03ebb718a..0c07adf0814400bec62e70928b56cb9a83cfc5ab 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FiveForty.php
+++ b/CRM/Upgrade/Incremental/php/FiveForty.php
@@ -91,6 +91,8 @@ class CRM_Upgrade_Incremental_php_FiveForty extends CRM_Upgrade_Incremental_Base
    */
   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`