Revert "fix(13909): fixed update_at column is ambiguous-column by qua…

…lifying column name (#26022)" (#26024) This reverts commit 1b0c52c.
laravel · Oct 9, 2018 · 891ddfc · 891ddfc
1 parent 1b0c52c
commit 891ddfc
Show file tree

Hide file tree

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

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