From 320ced74bdf9e7739d20397b5eff2e8ad98c95f1 Mon Sep 17 00:00:00 2001
From: nikunj <coder@nikunj.dev>
Date: Tue, 14 Apr 2020 12:12:03 +0530
Subject: [PATCH] 21853: Send the view object and do all processing in
 buildStatement.

---
 .../Framework/Mview/View/Subscription.php     | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mview/View/Subscription.php b/lib/internal/Magento/Framework/Mview/View/Subscription.php
index 642f5bc610653..cd6288a231eb9 100644
--- a/lib/internal/Magento/Framework/Mview/View/Subscription.php
+++ b/lib/internal/Magento/Framework/Mview/View/Subscription.php
@@ -113,17 +113,12 @@ public function create()
                 ->setEvent($event)
                 ->setTable($this->resource->getTableName($this->tableName));
 
-            $trigger->addStatement($this->buildStatement($event, $this->getView()->getChangelog(), $this->getColumnName()));
+            $trigger->addStatement($this->buildStatement($event, $this->getView()));
 
             // Add statements for linked views
             foreach ($this->getLinkedViews() as $view) {
                 /** @var \Magento\Framework\Mview\ViewInterface $view */
-                // Use the column name from specific linked view instead of
-                // using from the one which is currently updated for all
-                // the views.
-                $subscriptions = $view->getSubscriptions();
-                $subscription = $subscriptions[$this->getTableName()];
-                $trigger->addStatement($this->buildStatement($event, $view->getChangelog(), $subscription['column']));
+                $trigger->addStatement($this->buildStatement($event, $view));
             }
 
             $this->connection->dropTrigger($trigger->getName());
@@ -152,12 +147,7 @@ public function remove()
             // Add statements for linked views
             foreach ($this->getLinkedViews() as $view) {
                 /** @var \Magento\Framework\Mview\ViewInterface $view */
-                // Use the column name from specific linked view instead of
-                // using from the one which is currently updated for all
-                // the views.
-                $subscriptions = $view->getSubscriptions();
-                $subscription = $subscriptions[$this->getTableName()];
-                $trigger->addStatement($this->buildStatement($event, $view->getChangelog(), $subscription['column']));
+                $trigger->addStatement($this->buildStatement($event, $view));
             }
 
             $this->connection->dropTrigger($trigger->getName());
@@ -203,12 +193,18 @@ protected function getLinkedViews()
      * Build trigger statement for INSERT, UPDATE, DELETE events
      *
      * @param string $event
-     * @param \Magento\Framework\Mview\View\ChangelogInterface $changelog
-     * @param string $subscriptionColumnName
+     * @param \Magento\Framework\Mview\ViewInterface $view
      * @return string
      */
-    protected function buildStatement($event, $changelog, $subscriptionColumnName)
+    protected function buildStatement($event, $view)
     {
+        // Get the subscription for the specific view and specific table.
+        // We will use column name from it.
+        $subscription = $view->getSubscriptions()[$this->getTableName()];
+
+        // Get the changelog from View to get changelog column name.
+        $changelog = $view->getChangelog();
+
         switch ($event) {
             case Trigger::EVENT_INSERT:
                 $trigger = "INSERT IGNORE INTO %s (%s) VALUES (NEW.%s);";
@@ -247,7 +243,7 @@ protected function buildStatement($event, $changelog, $subscriptionColumnName)
             $trigger,
             $this->connection->quoteIdentifier($this->resource->getTableName($changelog->getName())),
             $this->connection->quoteIdentifier($changelog->getColumnName()),
-            $this->connection->quoteIdentifier($subscriptionColumnName)
+            $this->connection->quoteIdentifier($subscription['column'])
         );
     }