Check UPDATED_AT column existence in HasOneOrMany::update() (#23747)

laravel · Mar 30, 2018 · 707d669 · 707d669
1 parent f5b94cc
commit 707d669
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -316,7 +316,7 @@ protected function setForeignAttributesForCreate(Model $model)
      */
     public function update(array $attributes)
     {
-        if ($this->related->usesTimestamps()) {
+        if ($this->related->usesTimestamps() && ! is_null($this->relatedUpdatedAt())) {
             $attributes[$this->relatedUpdatedAt()] = $this->related->freshTimestampString();
         }
 

diff --git a/tests/Database/DatabaseEloquentHasManyTest.php b/tests/Database/DatabaseEloquentHasManyTest.php
@@ -173,6 +173,16 @@ public function testUpdateMethodUpdatesModelsWithTimestamps()
         $this->assertEquals('results', $relation->update(['foo' => 'bar']));
     }
 
+    public function testUpdateMethodUpdatesModelsWithNullUpdatedAt()
+    {
+        $relation = $this->getRelation();
+        $relation->getRelated()->shouldReceive('usesTimestamps')->once()->andReturn(true);
+        $relation->getRelated()->shouldReceive('getUpdatedAtColumn')->andReturn(null);
+        $relation->getQuery()->shouldReceive('update')->once()->with(['foo' => 'bar'])->andReturn('results');
+
+        $this->assertEquals('results', $relation->update(['foo' => 'bar']));
+    }
+
     public function testRelationIsProperlyInitialized()
     {
         $relation = $this->getRelation();

diff --git a/tests/Database/DatabaseEloquentHasOneTest.php b/tests/Database/DatabaseEloquentHasOneTest.php
@@ -136,6 +136,16 @@ public function testUpdateMethodUpdatesModelsWithTimestamps()
         $this->assertEquals('results', $relation->update(['foo' => 'bar']));
     }
 
+    public function testUpdateMethodUpdatesModelsWithNullUpdatedAt()
+    {
+        $relation = $this->getRelation();
+        $relation->getRelated()->shouldReceive('usesTimestamps')->once()->andReturn(true);
+        $relation->getRelated()->shouldReceive('getUpdatedAtColumn')->andReturn(null);
+        $relation->getQuery()->shouldReceive('update')->once()->with(['foo' => 'bar'])->andReturn('results');
+
+        $this->assertEquals('results', $relation->update(['foo' => 'bar']));
+    }
+
     public function testRelationIsProperlyInitialized()
     {
         $relation = $this->getRelation();