Merge pull request #69 from magento-commerce/MCLOUD-10032

MCLOUD-10032: Added ACSD-49067 patch

Author: BaDos

patches.json

@@ -264,6 +264,9 @@
     },
     "Fixed currency displaying on product page": {
       ">=2.4.3 <2.4.4": "MCLOUD-8279__Fixed_currency_displaying_on_product_page__2.4.3.patch"
+    },
+    "Auto increment number jumping up for catalog_product_entity_* tables": {
+      ">=2.3.7 <2.4.7": "MCLOUD-10032__Increment_number_for_catalog_product_entity_tables__2.4.3-p1.patch"
     }
   },
   "magento/module-paypal": {

patches/MCLOUD-10032__Increment_number_for_catalog_product_entity_tables__2.4.3-p1.patch

@@ -0,0 +1,48 @@
+diff -Nuar a/vendor/magento/module-catalog/Model/ResourceModel/AbstractResource.php b/vendor/magento/module-catalog/Model/ResourceModel/AbstractResource.php
+index c71225b4fc6..3f0ee96d70e 100644
+--- a/vendor/magento/module-catalog/Model/ResourceModel/AbstractResource.php
++++ b/vendor/magento/module-catalog/Model/ResourceModel/AbstractResource.php
+@@ -24,14 +24,14 @@ use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
+ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
+ {
+     /**
+-     * Store manager
++     * Store manager to get the store information
+      *
+      * @var \Magento\Store\Model\StoreManagerInterface
+      */
+     protected $_storeManager;
+
+     /**
+-     * Model factory
++     * Model factory to create a model object
+      *
+      * @var \Magento\Catalog\Model\Factory
+      */
+@@ -325,7 +325,25 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
+      */
+     protected function _updateAttribute($object, $attribute, $valueId, $value)
+     {
+-        return $this->_saveAttributeValue($object, $attribute, $value);
++        $entity = $attribute->getEntity();
++        $row = $this->getAttributeRow($entity, $object, $attribute);
++        $hasSingleStore = $this->_storeManager->hasSingleStore();
++        $storeId = $hasSingleStore
++            ? $this->getDefaultStoreId()
++            : (int) $this->_storeManager->getStore($object->getStoreId())->getId();
++        if ($valueId > 0 && array_key_exists('store_id', $row) && $storeId === $row['store_id']) {
++            $table = $attribute->getBackend()->getTable();
++            $connection = $this->getConnection();
++            $connection->update(
++                $table,
++                ['value' => $this->_prepareValueForSave($value, $attribute)],
++                sprintf('%s=%d', $connection->quoteIdentifier('value_id'), $valueId)
++            );
++
++            return $this;
++        } else {
++            return $this->_saveAttributeValue($object, $attribute, $value);
++        }
+     }
+
+     /**