MAGETWO-43755: [GITHUB] The commit «PCF: removing grouped price» from 2015-10-02 breaks Magento schema upgrading with the exception

Author: Andrii Kasian

app/code/Magento/Catalog/Setup/UpgradeData.php

@@ -39,8 +39,7 @@ public function __construct(CategorySetupFactory $categorySetupFactory)
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
-        if ($context->getVersion() && version_compare($context->getVersion(), '2.0.1') < 0) {
-
+        if (version_compare($context->getVersion(), '2.0.1') < 0) {
             /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
             $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
 
@@ -53,9 +52,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 'Images',
                 'attribute_group_name'
             );
-            if (isset($attributeGroup['attribute_group_name'])
-                && $attributeGroup['attribute_group_name'] == 'Images'
-            ) {
+            if (isset($attributeGroup['attribute_group_name']) && $attributeGroup['attribute_group_name'] == 'Images') {
                 // update General Group
                 $categorySetup->updateAttributeGroup(
                     $entityTypeId,
@@ -65,6 +62,11 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                     'Images and Videos'
                 );
             }
+        }
+
+        if ($context->getVersion()
+            && version_compare($context->getVersion(), '2.0.1') < 0
+        ) {
             $select = $setup->getConnection()->select()
                 ->from(
                     $setup->getTable('catalog_product_entity_group_price'),