MAGETWO-66470: Refactor catalog module 2.1.4 version data and schema update

Author: vzabaznov

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

@@ -34,6 +34,10 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         }
 
         if (version_compare($context->getVersion(), '2.1.4', '<')) {
+            $this->addSourceEntityIdToProductEavIndex($setup);
+        }
+
+        if (version_compare($context->getVersion(), '2.1.5', '<')) {
             $this->addPercentageValueColumn($setup);
             $tables = [
                 'catalog_product_index_price_cfg_opt_agr_idx',
@@ -56,7 +60,6 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                     ['type' => 'integer', 'nullable' => false]
                 );
             }
-            $this->addSourceEntityIdToProductEavIndex($setup);
             $this->recreateCatalogCategoryProductIndexTmpTable($setup);
         }
 

app/code/Magento/Catalog/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Catalog" setup_version="2.1.5">
+    <module name="Magento_Catalog" setup_version="2.1.6">
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Cms"/>