From dd4dec8618cd4b514df76145681a3aff71f4a1dd Mon Sep 17 00:00:00 2001
From: magento-engcom-team <mikola.malevanec@transoftgroup.com>
Date: Mon, 4 Dec 2017 11:38:02 +0200
Subject: [PATCH] 12110: Missing cascade into attribute set deletion.
---
app/code/Magento/Catalog/Setup/UpgradeSchema.php | 6 ++----
.../Model/AttributeSetRepository/RemoveProductsTest.php | 4 +---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/app/code/Magento/Catalog/Setup/UpgradeSchema.php b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
index ae09ff11136..78106e3ff3a 100755
--- a/app/code/Magento/Catalog/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
@@ -714,11 +714,9 @@ class UpgradeSchema implements UpgradeSchemaInterface
*/
private function removeAttributeSetRelation(SchemaSetupInterface $setup)
{
- $productTable = $setup->getTable('catalog_product_entity');
- $attributeSetTable = $setup->getTable('eav_attribute_set');
$setup->getConnection()->dropForeignKey(
- $productTable,
- $setup->getFkName($productTable, 'attribute_set_id', $attributeSetTable, 'attribute_set_id')
+ $setup->getTable('catalog_product_entity'),
+ $setup->getFkName('catalog_product_entity', 'attribute_set_id', 'eav_attribute_set', 'attribute_set_id')
);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Plugin/Model/AttributeSetRepository/RemoveProductsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Plugin/Model/AttributeSetRepository/RemoveProductsTest.php
index 724e2e62f23..2896716a01a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Plugin/Model/AttributeSetRepository/RemoveProductsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Plugin/Model/AttributeSetRepository/RemoveProductsTest.php
@@ -4,11 +4,10 @@
* See COPYING.txt for license details.
*/
-namespace Magento\CatalogUrlRewrite\Plugin\Eav\AttributeSetRepository;
+namespace Magento\Catalog\Plugin\Model\AttributeSetRepository;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Catalog\Plugin\Model\AttributeSetRepository\RemoveProducts;
use Magento\Eav\Api\AttributeSetRepositoryInterface;
use Magento\Eav\Model\Entity\Attribute\Set;
use Magento\TestFramework\Helper\Bootstrap;
@@ -36,7 +35,6 @@ class RemoveProductsTest extends TestCase
* Test related to given attribute set products will be removed, if attribute set will be deleted.
*
* @magentoDataFixture Magento/Catalog/_files/attribute_set_with_product.php
- * @magentoDbIsolation enabled
*/
public function testAroundDelete()
{
--
GitLab