Merge branch 'develop' of github.com:magento-troll/magento2ce into MAGETWO-66100

slopukhov · slopukhov · commit f7c58d31e0a7 · 2017-03-29T10:55:29.000+03:00
diff --git a/app/code/Magento/Catalog/Setup/UpgradeSchema.php b/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);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if (version_compare($context->getVersion(), '2.1.4', '<')) {`
	`37`	`+ $this->addSourceEntityIdToProductEavIndex($setup);`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ if (version_compare($context->getVersion(), '2.1.5', '<')) {`
`37`	`41`	`$this->addPercentageValueColumn($setup);`
`38`	`42`	`$tables = [`
`39`	`43`	`'catalog_product_index_price_cfg_opt_agr_idx',`
`@@ -56,7 +60,6 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con`
`56`	`60`	`['type' => 'integer', 'nullable' => false]`
`57`	`61`	`);`
`58`	`62`	`}`
`59`		`- $this->addSourceEntityIdToProductEavIndex($setup);`
`60`	`63`	`$this->recreateCatalogCategoryProductIndexTmpTable($setup);`
`61`	`64`	`}`
`62`	`65`