ACP2E-1522: Auto increment number jumping up for catalog_product_entity_* tables

 - Fixed the build error.

Author: devarul

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

@@ -221,27 +221,6 @@ protected function _saveAttributeValue($object, $attribute, $value)
                 'value' => $this->_prepareValueForSave($value, $attribute),
             ]
         );
-
-        $entity = $attribute->getEntity();
-        $row = $this->getAttributeRow($entity, $object, $attribute);
-        $whereArr = [];
-        foreach ($row as $field => $value) {
-            $whereArr[] = $connection->quoteInto($field . '=?', $value);
-        }
-        $where = implode(' AND ', $whereArr);
-        $select = $connection->select()->from($table, ['value_id', 'value', 'store_id'])->where($where);
-        $origRow = $connection->fetchRow($select);
-        $origValueId = $origRow['value_id'] ?? false;
-        $origStoreId = (int) $origRow['store_id'] ?? 0;
-        $storeIds = $this->_storeManager->getStore($storeId)->getWebsite()->getStoreIds(true);
-
-        if ($origValueId > 0 && count($storeIds) === 1) {
-            $data->setData('value_id', $origValueId);
-            if ($storeId !== $origStoreId) {
-                $data->setData('store_id', $origStoreId);
-            }
-        }
-
         $bind = $this->_prepareDataForTable($data, $table);
 
         if ($attribute->isScopeStore()) {
@@ -253,6 +232,7 @@ protected function _saveAttributeValue($object, $attribute, $value)
             /**
              * Update attribute value for website
              */
+            $storeIds = $this->_storeManager->getStore($storeId)->getWebsite()->getStoreIds(true);
             foreach ($storeIds as $storeId) {
                 $bind['store_id'] = (int) $storeId;
                 $this->_attributeValuesToSave[$table][] = $bind;

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -1669,6 +1669,7 @@ protected function _deleteAttributes($object, $table, $info)
      */
     public function saveAttribute(DataObject $object, $attributeCode)
     {
+        $updateValue = 0;
         $attribute = $this->getAttribute($attributeCode);
         $backend = $attribute->getBackend();
         $table = $backend->getTable();
@@ -1699,10 +1700,15 @@ public function saveAttribute(DataObject $object, $attributeCode)
                 $this->_insertAttribute($object, $attribute, $newValue);
             } elseif ($origValueId !== false && $newValue !== null) {
                 $this->_updateAttribute($object, $attribute, $origValueId, $newValue);
+                $updateValue = 1;
             } elseif ($origValueId !== false && $newValue === null && $origValue !== null) {
                 $connection->delete($table, $where);
             }
-            $this->_processAttributeValues();
+            if ($updateValue === 1) {
+                $this->_updateAttributeValues($attribute, $origValueId);
+            } else {
+                $this->_processAttributeValues();
+            }
             $connection->commit();
         } catch (\Exception $e) {
             $connection->rollBack();
@@ -2011,4 +2017,32 @@ protected function loadAttributesForObject($attributes, $object = null)
             }
         }
     }
+
+    /**
+     * Update entity attribute values
+     *
+     * @param AbstractAttribute $attribute
+     * @param mixed $valueId
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function _updateAttributeValues(AbstractAttribute $attribute, mixed $valueId): static
+    {
+        $connection = $this->getConnection();
+        foreach ($this->_attributeValuesToSave as $table => $data) {
+            foreach ($data as $columnValue) {
+                $connection->update(
+                    $table,
+                    ['value' => $this->_prepareValueForSave($columnValue['value'], $attribute)],
+                    sprintf('%s=%d', $connection->quoteIdentifier('value_id'), $valueId)
+                );
+            }
+        }
+
+        // reset data arrays
+        $this->_attributeValuesToSave = [];
+
+
+        return $this;
+    }
 }