MAGETWO-69230: #7279 bill-to name and ship-to name truncated to 20 chars #9654

 - Merge conflict resolved

Author: ishakhsuvarov

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

@@ -66,35 +66,28 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ]
             );
         }
-        if (version_compare($context->getVersion(), '2.0.5', '<')) {
-            $setup->getConnection(self::$connectionName)->changeColumn(
+        if (version_compare($context->getVersion(), '2.0.6', '<')) {
+            $connection = $setup->getConnection(self::$connectionName);
+            $connection->modifyColumn(
                 $setup->getTable('quote_address', self::$connectionName),
                 'firstname',
-                'firstname',
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
                     'length' => 255,
-                    'comment' => 'Firstname'
                 ]
-            );
-            $setup->getConnection(self::$connectionName)->changeColumn(
+            )->modifyColumn(
                 $setup->getTable('quote_address', self::$connectionName),
                 'middlename',
-                'middlename',
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
                     'length' => 40,
-                    'comment' => 'Middlename'
                 ]
-            );
-            $setup->getConnection(self::$connectionName)->changeColumn(
+            )->modifyColumn(
                 $setup->getTable('quote_address', self::$connectionName),
                 'lastname',
-                'lastname',
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
                     'length' => 255,
-                    'comment' => 'Lastname'
                 ]
             );
         }

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

@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Quote" setup_version="2.0.5">
+    <module name="Magento_Quote" setup_version="2.0.6">
     </module>
 </config>