From 523f0d8c418f98ac78593f3cb17e612beedb4fd0 Mon Sep 17 00:00:00 2001
From: Jonas Staudenmeir <mail@jonas-staudenmeir.de>
Date: Tue, 9 Oct 2018 18:06:58 +0200
Subject: [PATCH] Revert "fix(13909): fixed update_at column is
 ambiguous-column by qualifying column name (#26022)"

This reverts commit 1b0c52cfe33a78b883402411b90597787821f071.
---
 src/Illuminate/Database/Eloquent/Builder.php        | 13 ++++---------
 .../Database/Eloquent/Concerns/HasTimestamps.php    | 10 ----------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
index b67ff1d05bb4..fd9919ef05ef 100755
--- 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
index fb355c5bf217..ce3e0801dee6 100644
--- 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();
-    }
 }