Merge branch '2.2-develop' of https://github.com/magento-qwerty/magento2ce into MAGETWO-81431

Author: Oleksandr Gorkun

app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js

@@ -145,6 +145,8 @@ define([
         _initBraintree: function () {
             var self = this;
 
+            this.disableEventListeners();
+
             self.braintree.setup(self.clientToken, 'custom', {
                 id: self.selector,
                 hostedFields: self.getHostedFields(),
@@ -154,6 +156,7 @@ define([
                  */
                 onReady: function () {
                     $('body').trigger('processStop');
+                    self.enableEventListeners();
                 },
 
                 /**

app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php

@@ -241,12 +241,13 @@ protected function processNewAndExistingImages($product, array &$images)
             if (empty($image['removed'])) {
                 $data = $this->processNewImage($product, $image);
 
-                $this->resourceModel->deleteGalleryValueInStore(
-                    $image['value_id'],
-                    $product->getData($this->metadata->getLinkField()),
-                    $product->getStoreId()
-                );
-
+                if (!$product->isObjectNew()) {
+                    $this->resourceModel->deleteGalleryValueInStore(
+                        $image['value_id'],
+                        $product->getData($this->metadata->getLinkField()),
+                        $product->getStoreId()
+                    );
+                }
                 // Add per store labels, position, disabled
                 $data['value_id'] = $image['value_id'];
                 $data['label'] = isset($image['label']) ? $image['label'] : '';

app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php

@@ -30,28 +30,20 @@ class SaveHandler
      */
     private $linkResource;
 
-    /**
-     * @var linkTypeProvider
-     */
-    private $linkTypeProvider;
-
     /**
      * SaveHandler constructor.
      * @param MetadataPool $metadataPool
      * @param Link $linkResource
      * @param ProductLinkRepositoryInterface $productLinkRepository
-     * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
      */
     public function __construct(
         MetadataPool $metadataPool,
         Link $linkResource,
-        ProductLinkRepositoryInterface $productLinkRepository,
-        \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
+        ProductLinkRepositoryInterface $productLinkRepository
     ) {
         $this->metadataPool = $metadataPool;
         $this->linkResource = $linkResource;
         $this->productLinkRepository = $productLinkRepository;
-        $this->linkTypeProvider = $linkTypeProvider;
     }
 
     /**

app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

@@ -177,7 +177,10 @@ protected function _prepareLoadSelect(array $selects)
     protected function _saveAttributeValue($object, $attribute, $value)
     {
         $connection = $this->getConnection();
-        $storeId = (int) $this->_storeManager->getStore($object->getStoreId())->getId();
+        $hasSingleStore = $this->_storeManager->hasSingleStore();
+        $storeId = $hasSingleStore
+            ? $this->getDefaultStoreId()
+            : (int) $this->_storeManager->getStore($object->getStoreId())->getId();
         $table = $attribute->getBackend()->getTable();
 
         /**
@@ -186,15 +189,18 @@ protected function _saveAttributeValue($object, $attribute, $value)
          * In this case we clear all not default values
          */
         $entityIdField = $this->getLinkField();
-        if ($this->_storeManager->hasSingleStore()) {
-            $storeId = $this->getDefaultStoreId();
+        $conditions = [
+            'attribute_id = ?' => $attribute->getAttributeId(),
+            "{$entityIdField} = ?" => $object->getData($entityIdField),
+            'store_id <> ?' => $storeId
+        ];
+        if ($hasSingleStore
+            && !$object->isObjectNew()
+            && $this->isAttributePresentForNonDefaultStore($attribute, $conditions)
+        ) {
             $connection->delete(
                 $table,
-                [
-                    'attribute_id = ?' => $attribute->getAttributeId(),
-                    "{$entityIdField} = ?" => $object->getData($entityIdField),
-                    'store_id <> ?' => $storeId
-                ]
+                $conditions
             );
         }
 
@@ -233,6 +239,27 @@ protected function _saveAttributeValue($object, $attribute, $value)
         return $this;
     }
 
+    /**
+     * Check if attribute present for non default Store View.
+     * Prevent "delete" query locking in a case when nothing to delete
+     *
+     * @param AbstractAttribute $attribute
+     * @param array $conditions
+     *
+     * @return boolean
+     */
+    private function isAttributePresentForNonDefaultStore($attribute, $conditions)
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()->from($attribute->getBackend()->getTable());
+        foreach ($conditions as $condition => $conditionValue) {
+            $select->where($condition, $conditionValue);
+        }
+        $select->limit(1);
+
+        return !empty($connection->fetchRow($select));
+    }
+
     /**
      * Insert entity attribute value
      *
@@ -568,8 +595,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
         }
 
         if (is_array($attributesData) && sizeof($attributesData) == 1) {
-            $_data = each($attributesData);
-            $attributesData = $_data[1];
+            $attributesData = array_shift($attributesData);
         }
 
         return $attributesData === false ? false : $attributesData;

app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php

@@ -83,11 +83,12 @@ public function saveCategoryLinks(ProductInterface $product, array $categoryLink
         $insertUpdate = $this->processCategoryLinks($categoryLinks, $oldCategoryLinks);
         $deleteUpdate = $this->processCategoryLinks($oldCategoryLinks, $categoryLinks);
 
-        list($delete, $insert) = $this->analyseUpdatedLinks($deleteUpdate, $insertUpdate);
+        list($delete, $insert, $update) = $this->analyseUpdatedLinks($deleteUpdate, $insertUpdate);
 
         return array_merge(
-            $this->updateCategoryLinks($product, $insert),
-            $this->deleteCategoryLinks($product, $delete)
+            $this->deleteCategoryLinks($product, $delete),
+            $this->updateCategoryLinks($product, $insert, true),
+            $this->updateCategoryLinks($product, $update)
         );
     }
 
@@ -133,16 +134,15 @@ private function processCategoryLinks($newCategoryPositions, &$oldCategoryPositi
     /**
      * @param ProductInterface $product
      * @param array $insertLinks
+     * @param bool $insert
      * @return array
      */
-    private function updateCategoryLinks(ProductInterface $product, array $insertLinks)
+    private function updateCategoryLinks(ProductInterface $product, array $insertLinks, $insert = false)
     {
         if (empty($insertLinks)) {
             return [];
         }
 
-        $connection = $this->resourceConnection->getConnection();
-
         $data = [];
         foreach ($insertLinks as $categoryLink) {
             $data[] = [
@@ -153,11 +153,22 @@ private function updateCategoryLinks(ProductInterface $product, array $insertLin
         }
 
         if ($data) {
-            $connection->insertOnDuplicate(
-                $this->getCategoryLinkMetadata()->getEntityTable(),
-                $data,
-                ['position']
-            );
+            $connection = $this->resourceConnection->getConnection();
+            if ($insert) {
+                $connection->insertArray(
+                    $this->getCategoryLinkMetadata()->getEntityTable(),
+                    array_keys($data[0]),
+                    $data,
+                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_IGNORE
+                );
+            } else {
+                // for mass update category links with constraint by unique key use insert on duplicate statement
+                $connection->insertOnDuplicate(
+                    $this->getCategoryLinkMetadata()->getEntityTable(),
+                    $data,
+                    ['position']
+                );
+            }
         }
 
         return array_column($insertLinks, 'category_id');
@@ -215,7 +226,7 @@ private function verifyCategoryLinks(array $links)
     }
 
     /**
-     * Analyse category links for update or/and delete
+     * Analyse category links for update or/and delete. Return array of links for delete, insert and update
      *
      * @param array $deleteUpdate
      * @param array $insertUpdate
@@ -226,8 +237,7 @@ private function analyseUpdatedLinks($deleteUpdate, $insertUpdate)
         $delete = $deleteUpdate['changed'] ?: [];
         $insert = $insertUpdate['changed'] ?: [];
         $insert = array_merge_recursive($insert, $deleteUpdate['updated']);
-        $insert = array_merge_recursive($insert, $insertUpdate['updated']);
 
-        return [$delete, $insert];
+        return [$delete, $insert, $insertUpdate['updated']];
     }
 }

app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
 /**
  * Catalog product link resource model
  *
@@ -136,7 +138,6 @@ public function saveProductLinks($parentId, $data, $typeId)
             $data = [];
         }
 
-        $attributes = $this->getAttributesByType($typeId);
         $connection = $this->getConnection();
 
         $bind = [':product_id' => (int)$parentId, ':link_type_id' => (int)$typeId];
@@ -151,42 +152,38 @@ public function saveProductLinks($parentId, $data, $typeId)
 
         $links = $connection->fetchPairs($select, $bind);
 
-        foreach ($data as $linkedProductId => $linkInfo) {
-            $linkId = null;
-            if (isset($links[$linkedProductId])) {
-                $linkId = $links[$linkedProductId];
-                unset($links[$linkedProductId]);
-            } else {
-                $bind = [
-                    'product_id' => $parentId,
-                    'linked_product_id' => $linkedProductId,
-                    'link_type_id' => $typeId,
-                ];
-                $connection->insert($this->getMainTable(), $bind);
-                $linkId = $connection->lastInsertId($this->getMainTable());
-            }
+        list($insertData, $updateData, $deleteConditions) = $this->prepareProductLinksData(
+            $parentId,
+            $data,
+            $typeId,
+            $links
+        );
 
-            foreach ($attributes as $attributeInfo) {
-                $attributeTable = $this->getAttributeTypeTable($attributeInfo['type']);
-                if ($attributeTable) {
-                    if (isset($linkInfo[$attributeInfo['code']])) {
-                        $value = $this->_prepareAttributeValue(
-                            $attributeInfo['type'],
-                            $linkInfo[$attributeInfo['code']]
-                        );
-                        $bind = [
-                            'product_link_attribute_id' => $attributeInfo['id'],
-                            'link_id' => $linkId,
-                            'value' => $value,
-                        ];
-                        $connection->insertOnDuplicate($attributeTable, $bind, ['value']);
-                    } else {
-                        $connection->delete(
-                            $attributeTable,
-                            ['link_id = ?' => $linkId, 'product_link_attribute_id = ?' => $attributeInfo['id']]
-                        );
-                    }
-                }
+        if ($insertData) {
+            $insertColumns = [
+                'product_link_attribute_id',
+                'link_id',
+                'value',
+            ];
+            foreach ($insertData as $table => $values) {
+                $connection->insertArray($table, $insertColumns, $values, AdapterInterface::INSERT_IGNORE);
+            }
+        }
+        if ($updateData) {
+            // for mass update product links with constraint by unique key use insert on duplicate statement
+            foreach ($updateData as $table => $values) {
+                $connection->insertOnDuplicate($table, $values, ['value']);
+            }
+        }
+        if ($deleteConditions) {
+            foreach ($deleteConditions as $table => $deleteCondition) {
+                $connection->delete(
+                    $table,
+                    [
+                        'link_id = ?' => $deleteCondition['link_id'],
+                        'product_link_attribute_id = ?' => $deleteCondition['product_link_attribute_id']
+                    ]
+                );
             }
         }
 
@@ -302,4 +299,69 @@ public function getParentIdsByChild($childId, $typeId)
 
         return $parentIds;
     }
+
+    /**
+     * Prepare data for insert, update or delete product link attributes
+     *
+     * @param int $parentId
+     * @param array $data
+     * @param int $typeId
+     * @param array $links
+     * @return array
+     */
+    private function prepareProductLinksData($parentId, $data, $typeId, $links)
+    {
+        $connection =  $this->getConnection();
+        $attributes = $this->getAttributesByType($typeId);
+
+        $insertData = [];
+        $updateData = [];
+        $deleteConditions = [];
+
+        foreach ($data as $linkedProductId => $linkInfo) {
+            $linkId = null;
+            if (isset($links[$linkedProductId])) {
+                $linkId = $links[$linkedProductId];
+            } else {
+                $bind = [
+                    'product_id' => $parentId,
+                    'linked_product_id' => $linkedProductId,
+                    'link_type_id' => $typeId,
+                ];
+                $connection->insert($this->getMainTable(), $bind);
+                $linkId = $connection->lastInsertId($this->getMainTable());
+            }
+
+            foreach ($attributes as $attributeInfo) {
+                $attributeTable = $this->getAttributeTypeTable($attributeInfo['type']);
+                if (!$attributeTable) {
+                    continue;
+                }
+                if (isset($linkInfo[$attributeInfo['code']])) {
+                    $value = $this->_prepareAttributeValue(
+                        $attributeInfo['type'],
+                        $linkInfo[$attributeInfo['code']]
+                    );
+                    if (isset($links[$linkedProductId])) {
+                        $updateData[$attributeTable][] = [
+                            'product_link_attribute_id' => $attributeInfo['id'],
+                            'link_id' => $linkId,
+                            'value' => $value,
+                        ];
+                    } else {
+                        $insertData[$attributeTable][] = [
+                            'product_link_attribute_id' => $attributeInfo['id'],
+                            'link_id' => $linkId,
+                            'value' => $value,
+                        ];
+                    }
+                } else {
+                    $deleteConditions[$attributeTable]['link_id'][] = $linkId;
+                    $deleteConditions[$attributeTable]['product_link_attribute_id'][] = $attributeInfo['id'];
+                }
+            }
+        }
+
+        return [$insertData, $updateData, $deleteConditions];
+    }
 }