MAGETWO-55598: Portdown MAGETWO-54787 down to M2.1.x branch

Author: Yuriy Denyshchenko

app/code/Magento/Sales/Setup/InstallSchema.php

@@ -3216,12 +3216,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             '12,4',
             [],
             'Grand Total'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Grand Total'
         )->addColumn(
             'created_at',
             \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
@@ -3240,9 +3234,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         )->addIndex(
             $installer->getIdxName('sales_invoice_grid', ['grand_total']),
             ['grand_total']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['base_grand_total']),
-            ['base_grand_total']
         )->addIndex(
             $installer->getIdxName('sales_invoice_grid', ['order_id']),
             ['order_id']

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

@@ -7,6 +7,7 @@
 use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
  * @codeCoverageIgnore
@@ -53,5 +54,43 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
 
             $installer->endSetup();
         }
+        if (version_compare($context->getVersion(), '2.0.3', '<')) {
+            $this->addColumnBaseGrandTotal($installer);
+            $this->addIndexBaseGrandTotal($installer);
+        }
+    }
+
+    /**
+     * @param SchemaSetupInterface $installer
+     * @return void
+     */
+    private function addColumnBaseGrandTotal(SchemaSetupInterface $installer)
+    {
+        $connection = $installer->getConnection();
+        $connection->addColumn(
+            $installer->getTable('sales_invoice_grid'),
+            'base_grand_total',
+            [
+                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
+                'nullable' => true,
+                'length' => '12,4',
+                'comment' => 'Base Grand Total',
+                'after' => 'grand_total'
+            ]
+        );
+    }
+
+    /**
+     * @param SchemaSetupInterface $installer
+     * @return void
+     */
+    private function addIndexBaseGrandTotal(SchemaSetupInterface $installer)
+    {
+        $connection = $installer->getConnection();
+        $connection->addIndex(
+            $installer->getTable('sales_invoice_grid'),
+            $installer->getIdxName('sales_invoice_grid', ['base_grand_total']),
+            ['base_grand_total']
+        );
     }
 }

app/code/Magento/Sales/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_Sales" setup_version="2.0.2">
+    <module name="Magento_Sales" setup_version="2.0.3">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>