MAGETWO-95455: [GitHub] Fields from third-party extensions cause error during migration with -auto option #595

Author: victor-v-rad

src/Migration/RecordTransformer.php

@@ -128,13 +128,16 @@ protected function copy(Record $from, Record $to)
     {
         $sourceDocumentName = $this->sourceDocument->getName();
         $sourceFields = $from->getFields();
+        $sourceFieldsExtra = array_diff($sourceFields, $to->getFields());
         $data = [];
         foreach ($sourceFields as $key => $field) {
             if ($this->mapReader->isFieldIgnored($sourceDocumentName, $field, MapInterface::TYPE_SOURCE)) {
-                unset($sourceFields[$key]);
                 continue;
             }
             $fieldMap = $this->mapReader->getFieldMap($sourceDocumentName, $field, MapInterface::TYPE_SOURCE);
+            if ($fieldMap == $field && in_array($field, $sourceFieldsExtra)) {
+                continue;
+            }
             $data[$fieldMap] = $from->getValue($field);
         }
         foreach ($data as $key => $value) {

tests/integration/resource/default/dest.sql

@@ -38,6 +38,29 @@ LOCK TABLES `common_table` WRITE;
 /*!40000 ALTER TABLE `common_table` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `common_table_extra_field`
+--
+
+DROP TABLE IF EXISTS `common_table_extra_field`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `common_table_extra_field` (
+  `key` int(11) NOT NULL AUTO_INCREMENT,
+  `common_field` int(11) DEFAULT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `common_table_extra_field`
+--
+
+LOCK TABLES `common_table_extra_field` WRITE;
+/*!40000 ALTER TABLE `common_table_extra_field` DISABLE KEYS */;
+/*!40000 ALTER TABLE `common_table_extra_field` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `dest_table_ignored`
 --

tests/integration/resource/default/source.sql

@@ -39,6 +39,31 @@ INSERT INTO `common_table` VALUES (1,2,3),(2,3,4),(3,4,5),(4,5,6),(5,5,5),(6,6,7
 /*!40000 ALTER TABLE `common_table` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `common_table_extra_field`
+--
+
+DROP TABLE IF EXISTS `common_table_extra_field`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `common_table_extra_field` (
+  `key` int(11) NOT NULL AUTO_INCREMENT,
+  `common_field` int(11) DEFAULT NULL,
+  `source_field_extra` int(11) DEFAULT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `common_table_extra_field`
+--
+
+LOCK TABLES `common_table_extra_field` WRITE;
+/*!40000 ALTER TABLE `common_table_extra_field` DISABLE KEYS */;
+INSERT INTO `common_table_extra_field` VALUES (1,2,3),(2,3,4),(3,4,5),(4,5,6),(5,5,5),(6,6,7),(7,7,7);
+/*!40000 ALTER TABLE `common_table_extra_field` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `source_table_ignored`
 --

tests/integration/testsuite/Migration/Step/Map/IntegrityTest.php

@@ -42,9 +42,16 @@ public function testIntegrityWithMap()
         ob_start();
         $map->perform();
         ob_end_clean();
+        $logOutput = \Migration\Logger\Logger::getMessages();
+        $this->assertTrue(isset($logOutput[\Monolog\Logger::ERROR]));
 
+        $config->setOption(\Migration\Config::OPTION_AUTO_RESOLVE, 1);
+        \Migration\Logger\Logger::clearMessages();
+        ob_start();
+        $map->perform();
+        ob_end_clean();
         $logOutput = \Migration\Logger\Logger::getMessages();
-        $this->assertFalse(isset($logOutput[\Monolog\Logger::ERROR]));
+        $this->assertTrue(isset($logOutput[\Monolog\Logger::WARNING]));
     }
 
     /**
@@ -59,6 +66,7 @@ public function testIntegrityWithoutMap()
         $logger = $objectManager->create(\Migration\Logger\Logger::class);
         $logger->pushHandler($objectManager->create(\Migration\Logger\ConsoleHandler::class));
         $config = $objectManager->get(\Migration\Config::class);
+        $config->setOption(\Migration\Config::OPTION_AUTO_RESOLVE, 0);
         /** @var \Migration\Logger\Manager $logManager */
         $logManager->process(\Migration\Logger\Manager::LOG_LEVEL_ERROR);
         \Migration\Logger\Logger::clearMessages();