Mview patch update

Author: skovalenk

lib/internal/Magento/Framework/Mview/View.php

@@ -313,6 +313,7 @@ private function executeAction(ActionInterface $action, int $lastVersionId, int
                     'view_id' => $this->changelog->getViewId()
                 ];
                 $ids = $this->strategies[$this->changelog->getViewId()]->walk($changelogData, $vsFrom, $batchSize);
+                $vsFrom += $batchSize;
                 $action->execute($ids);
             } else {
                 $ids = $this->getBatchOfIds($vsFrom, $currentVersionId);

lib/internal/Magento/Framework/Mview/View/Changelog.php

@@ -117,7 +117,7 @@ public function create()
                     self::ATTRIBUTE_COLUMN,
                     \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
                     null,
-                    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+                    ['unsigned' => true, 'nullable' => true],
                     'Attribute ID'
                 );
             }
@@ -126,7 +126,7 @@ public function create()
                     self::STORE_COLUMN,
                     \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
                     null,
-                    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+                    ['unsigned' => true, 'nullable' => true],
                     'Store ID'
                 );
             }

lib/internal/Magento/Framework/Mview/View/Subscription.php

@@ -242,6 +242,15 @@ protected function buildStatement($event, $changelog)
         );
     }
 
+    /**
+     * @param string $prefix
+     * @return string
+     */
+    public function getEntityColumn(string $prefix): string
+    {
+        return $prefix . $this->connection->quoteIdentifier($this->getColumnName());
+    }
+
     /**
      * Prepare column names and column values for trigger body
      *
@@ -256,19 +265,26 @@ public function prepareTriggerBody(ChangelogInterface $changelog, string $eventT
             $this->connection->describeTable($this->getTableName()),
             'COLUMN_NAME'
         );
+        $describedClColumns = array_column(
+            $this->connection->describeTable($changelog->getName()),
+            'COLUMN_NAME'
+        );
         $viewConfig = $this->mviewConfig->getView($this->getView()->getId());
         $columnNames = [$this->connection->quoteIdentifier($changelog->getColumnName())];
-        $columnValues = [$this->connection->quoteIdentifier($this->getColumnName())];
+        $columnValues = [$this->getEntityColumn($prefix)];
         //If we need to add attributes
         if ($viewConfig[ChangelogInterface::ATTRIBUTE_SCOPE_SUPPORT] &&
-            array_search(Changelog::ATTRIBUTE_COLUMN, $describedSubscribedColumns)
+            array_search(Changelog::ATTRIBUTE_COLUMN, $describedSubscribedColumns) &&
+            array_search(Changelog::ATTRIBUTE_COLUMN, $describedClColumns)
+
         ) {
             $columnValues[] = $prefix . $this->connection->quoteIdentifier(Changelog::ATTRIBUTE_COLUMN);
             $columnNames[] = $this->connection->quoteIdentifier(Changelog::ATTRIBUTE_COLUMN);
         }
         //If we need to add stores
         if ($viewConfig[ChangelogInterface::STORE_SCOPE_SUPPORT] &&
-            array_search(Changelog::STORE_COLUMN, $describedSubscribedColumns)
+            array_search(Changelog::STORE_COLUMN, $describedSubscribedColumns) &&
+            array_search(Changelog::STORE_COLUMN, $describedClColumns)
         ) {
             $columnValues[] = $prefix . $this->connection->quoteIdentifier(Changelog::STORE_COLUMN);
             $columnNames[] = $this->connection->quoteIdentifier(Changelog::STORE_COLUMN);