MAGETWO-58479: [Github]Magento 2.1.0: db fields with mysql default value CURRENT_TIMESTAMP cannot be updated through the EntityManager #5385

Author: valdislav

dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Cms\Model;
 
+use Magento\Cms\Api\PageRepositoryInterface;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -53,10 +55,10 @@ public function testUpdateTime()
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var \Magento\Cms\Model\Page $page */
         $page = $objectManager->create(\Magento\Cms\Model\Page::class);
-        $page->setData(['data' => ['title' => 'Test title', 'stores' => [1]], 'expectedIdentifier' => 'test-title']);
+        $page->setData(['title' => 'Test', 'stores' => [1]]);
         $page->setUpdateTime($updateTime);
         $page->save();
-        $page = $page->load($page->getId());
+        $page = $objectManager->get(PageRepositoryInterface::class)->getById($page->getId());
         $this->assertEquals($updateTime, $page->getUpdateTime());
     }
 

lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php

@@ -50,11 +50,12 @@ protected function prepareData(EntityMetadataInterface $metadata, AdapterInterfa
     {
         $output = [];
         foreach ($connection->describeTable($metadata->getEntityTable()) as $column) {
-
-            if ($column['DEFAULT'] == 'CURRENT_TIMESTAMP') {
+            $columnName = strtolower($column['COLUMN_NAME']);
+            if ($this->canNotSetTimeStamp($columnName, $column, $data)) {
                 continue;
             }
-            if (isset($data[strtolower($column['COLUMN_NAME'])])) {
+
+            if (isset($data[$columnName])) {
                 $output[strtolower($column['COLUMN_NAME'])] = $data[strtolower($column['COLUMN_NAME'])];
             } elseif ($column['DEFAULT'] === null) {
                 $output[strtolower($column['COLUMN_NAME'])] = null;
@@ -66,6 +67,18 @@ protected function prepareData(EntityMetadataInterface $metadata, AdapterInterfa
         return $output;
     }
 
+    /**
+     * @param string $columnName
+     * @param string $column
+     * @param array $data
+     * @return bool
+     */
+    private function canNotSetTimeStamp($columnName, $column, array $data)
+    {
+        return $column['DEFAULT'] == 'CURRENT_TIMESTAMP' && !isset($data[$columnName])
+        && empty($column['NULLABLE']);
+    }
+
     /**
      * @param string $entityType
      * @param array $data

lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php

@@ -68,6 +68,18 @@ protected function prepareData(EntityMetadataInterface $metadata, AdapterInterfa
         return $output;
     }
 
+    /**
+     * @param string $columnName
+     * @param string $column
+     * @param array $data
+     * @return bool
+     */
+    private function canNotSetTimeStamp($columnName, $column, array $data)
+    {
+        return $column['DEFAULT'] == 'CURRENT_TIMESTAMP' && !isset($data[$columnName])
+        && empty($column['NULLABLE']);
+    }
+
     /**
      * @param string $entityType
      * @param array $data
@@ -84,16 +96,4 @@ public function execute($entityType, $data)
         );
         return $data;
     }
-
-    /**
-     * @param string $columnName
-     * @param string $column
-     * @param array $data
-     * @return bool
-     */
-    protected function canNotSetTimeStamp($columnName, $column, array $data)
-    {
-        return $column['DEFAULT'] == 'CURRENT_TIMESTAMP' && !isset($data[$columnName])
-        && empty($column['NULLABLE']);
-    }
 }