fix(13909): fixed update_at column is ambiguous-column by qualifying …

…column name (#26022)
laravel · Oct 9, 2018 · 1b0c52c · 1b0c52c
1 parent 60721fc
commit 1b0c52c
Show file tree

Hide file tree

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

diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php b/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php
@@ -122,4 +122,14 @@ public function getUpdatedAtColumn()
     {
         return static::UPDATED_AT;
     }
+
+    /**
+     * Get the fully qualified "updated at" column.
+     *
+     * @return string
+     */
+    public function getQualifiedUpdatedAtColumn()
+    {
+        return $this->getTable().'.'.$this->getUpdatedAtColumn();
+    }
 }