Merge remote-tracking branch 'origin/5.2' into 5.2

laravel · May 18, 2016 · 1a3aa9a · 1a3aa9a
2 parents 2b52235 + b015a5b
commit 1a3aa9a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -559,9 +559,15 @@ protected function addUpdatedAtColumn(array $values)
             return $values;
         }
 
-        $column = $this->model->getUpdatedAtColumn();
+        if (count($this->getQuery()->joins) > 0) {
+            $column = $this->model->getQualifiedUpdatedAtColumn();
+        } else {
+            $column = $this->model->getUpdatedAtColumn();
+        }
 
-        return Arr::add($values, $column, $this->model->freshTimestampString());
+        return array_merge($values, [
+            $column => $this->model->freshTimestampString(),
+        ]);
     }
 
     /**

diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -1786,6 +1786,16 @@ public function getUpdatedAtColumn()
         return static::UPDATED_AT;
     }
 
+    /**
+     * Get the fully qualified "updated at" column.
+     *
+     * @return string
+     */
+    public function getQualifiedUpdatedAtColumn()
+    {
+        return $this->getTable().'.'.$this->getUpdatedAtColumn();
+    }
+
     /**
      * Get a fresh timestamp for the model.
      *