AC-13182::[Upgrade Build] Manual Upgrade Build 2.4.7-p2 -> 2.4.8-beta1

Author: jayrangnani-gl

lib/internal/Magento/Framework/Mview/Config/Converter.php

@@ -8,6 +8,7 @@
 use Magento\Framework\Mview\View\AdditionalColumnsProcessor\DefaultProcessor;
 use Magento\Framework\Mview\View\ChangelogBatchWalker;
 use Magento\Framework\Mview\View\SubscriptionInterface;
+use Magento\Framework\App\ResourceConnection;
 
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -22,13 +23,21 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
     private $defaultIterator;
 
     /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
      * @param string $defaultProcessor
      * @param string $defaultIterator
      */
     public function __construct(
+        ResourceConnection $resourceConnection,
         string $defaultProcessor = DefaultProcessor::class,
         string $defaultIterator = ChangelogBatchWalker::class
     ) {
+        $this->resourceConnection = $resourceConnection;
         $this->defaultProcessor = $defaultProcessor;
         $this->defaultIterator = $defaultIterator;
     }
@@ -100,6 +109,7 @@ protected function convertChild(\DOMNode $childNode, $data)
                     }
                     $name = $this->getAttributeValue($subscription, 'name');
                     $column = $this->getAttributeValue($subscription, 'entity_column');
+                    $column = $this->checkColumnOrReturnPrimarykeyColumn($name, $column);
                     $subscriptionModel = $this->getAttributeValue($subscription, 'subscription_model');
 
                     if (!empty($subscriptionModel)
@@ -155,4 +165,32 @@ private function getAdditionalColumns(\DOMNode $subscription): array
 
         return $additionalColumns;
     }
+
+    /**
+     * Check if column exists in table, otherwise return primary key column
+     *
+     * @param string $tableName
+     * @param string $columnName
+     * @return string
+     */
+    private function checkColumnOrReturnPrimarykeyColumn($tableName, $columnName)
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $tableName = $this->resourceConnection->getTableName($tableName);
+
+        if (!$connection->isTableExists($tableName) || $connection->tableColumnExists($tableName, $columnName)) {
+            return $columnName;
+        }
+
+        $primarykeyColumn = null;
+        $columns = $connection->describeTable($tableName);
+        foreach ($columns as $column) {
+            if (!empty($column['PRIMARY'])) {
+                $primarykeyColumn = $column['COLUMN_NAME'];
+                break;
+            }
+        }
+
+        return $primarykeyColumn;
+    }
 }

lib/internal/Magento/Framework/Mview/Test/Unit/Config/ConverterTest.php

@@ -1,12 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Framework\Mview\Test\Unit\Config;
 
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Mview\Config\Converter;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -18,13 +20,27 @@ class ConverterTest extends TestCase
      */
     protected $_model;
 
+    /**
+     * @var ResourceConnection|MockObject
+     */
+    protected $resourceConnectionMock;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|MockObject
+     */
+    protected $connectionMock;
+
     protected function setUp(): void
     {
-        $this->_model = new Converter();
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->_model = new Converter($this->resourceConnectionMock);
     }
 
     public function testConvert()
     {
+        $this->resourceConnectionMock->method('getConnection')
+            ->willReturn($this->connectionMock);
         $data = include __DIR__ . '/../_files/mview_config.php';
         $dom = new \DOMDocument();
         $dom->loadXML($data['inputXML']);