Merge branch 'MAGETWO-32012-new' of https://github.corp.ebay.com/magento-extensibility/magento2ce into MAGETWO-32012-new

Author: Joan He

lib/internal/Magento/Framework/Model/AbstractModel.php

@@ -132,7 +132,7 @@ abstract class AbstractModel extends \Magento\Framework\Object
      *
      * @var array
      */
-    private $storedData = [];
+    protected $storedData = [];
 
     /**
      * @param \Magento\Framework\Model\Context $context
@@ -705,7 +705,7 @@ protected function _clearData()
      *
      * @return $this
      */
-    protected function updateStoredData()
+    private function updateStoredData()
     {
         if (isset($this->_data)) {
             $this->storedData = $this->_data;

lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php

@@ -417,9 +417,7 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
                      * Not auto increment primary key support
                      */
                     if ($this->_isPkAutoIncrement) {
-                        $data = $this->_prepareDataForSave($object);
-                        unset($data[$this->getIdFieldName()]);
-                        $data = $this->prepareDataForUpdate($data, $object->getStoredData());
+                        $data = $this->prepareDataForUpdate($object);
                         if (!empty($data)) {
                             $this->_getWriteAdapter()->update($this->getMainTable(), $data, $condition);
                         }
@@ -431,9 +429,7 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
                             $condition
                         );
                         if ($this->_getWriteAdapter()->fetchOne($select) !== false) {
-                            $data = $this->_prepareDataForSave($object);
-                            unset($data[$this->getIdFieldName()]);
-                            $data = $this->prepareDataForUpdate($data, $object->getStoredData());
+                            $data = $this->prepareDataForUpdate($object);
                             if (!empty($data)) {
                                 $this->_getWriteAdapter()->update($this->getMainTable(), $data, $condition);
                             }
@@ -778,17 +774,20 @@ public function getChecksum($table)
     /**
      * Get the array of data fields that was changed or added
      *
-     * @param array $data
-     * @param array $storedData
+     * @param \Magento\Framework\Model\AbstractModel $object
      * @return array
      */
-    protected function prepareDataForUpdate($data, $storedData)
+    protected function prepareDataForUpdate($object)
     {
-        foreach ($storedData as $key => $value) {
+        $data = $this->_prepareDataForSave($object);
+        unset($data[$this->getIdFieldName()]);
+
+        foreach ($object->getStoredData() as $key => $value) {
             if(array_key_exists($key, $data) && $data[$key] == $value) {
                 unset($data[$key]);
             }
         }
+
         return $data;
     }
 }