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

@@ -181,10 +181,9 @@ protected function _prepareLoadSelect(array $selects)
      * @param \Magento\Catalog\Model\AbstractModel $object
      * @param AbstractAttribute $attribute
      * @param mixed $value
-     * @param int|null $valueId
      * @return $this
      */
-    protected function _saveAttributeValue($object, $attribute, $value, $valueId = null)
+    protected function _saveAttributeValue($object, $attribute, $value)
     {
         $connection = $this->getConnection();
         $hasSingleStore = $this->_storeManager->hasSingleStore();
@@ -214,25 +213,28 @@ protected function _saveAttributeValue($object, $attribute, $value, $valueId = n
             );
         }
 
-        if ($valueId > 0) {
-            $data = new \Magento\Framework\DataObject(
-                [
-                    'value_id' => $valueId,
-                    'attribute_id' => $attribute->getAttributeId(),
-                    'store_id' => $storeId,
-                    $entityIdField => $object->getData($entityIdField),
-                    'value' => $this->_prepareValueForSave($value, $attribute),
-                ]
-            );
-        } else {
-            $data = new \Magento\Framework\DataObject(
-                [
-                    'attribute_id' => $attribute->getAttributeId(),
-                    'store_id' => $storeId,
-                    $entityIdField => $object->getData($entityIdField),
-                    'value' => $this->_prepareValueForSave($value, $attribute),
-                ]
-            );
+        $data = new \Magento\Framework\DataObject(
+            [
+                'attribute_id' => $attribute->getAttributeId(),
+                'store_id' => $storeId,
+                $entityIdField => $object->getData($entityIdField),
+                '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'])->where($where);
+        $origRow = $connection->fetchRow($select);
+        $origValueId = $origRow['value_id'] ?? false;
+
+        if ($origValueId > 0) {
+            $data->setData('value_id', $origValueId);
         }
 
         $bind = $this->_prepareDataForTable($data, $table);
@@ -339,7 +341,7 @@ protected function _insertAttribute($object, $attribute, $value)
      */
     protected function _updateAttribute($object, $attribute, $valueId, $value)
     {
-        return $this->_saveAttributeValue($object, $attribute, $value, $valueId);
+        return $this->_saveAttributeValue($object, $attribute, $value);
     }
 
     /**