Skip to content

[5.5] fix(13909): fixed update_at column is ambiguous-column by qualifying … #26017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nickshatilo wants to merge 1 commit into from
Closed

[5.5] fix(13909): fixed update_at column is ambiguous-column by qualifying … #26017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/Illuminate/Database/Eloquent/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,10 +822,15 @@ protected function addUpdatedAtColumn(array $values)
return $values;
}

return Arr::add(
$values, $this->model->getUpdatedAtColumn(),
$this->model->freshTimestampString()
);
if (count($this->getQuery()->joins) > 0) {

@mfn mfn Oct 9, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like this is the PHP 7.2 break in case joins is e.g. null?

@nickshatilo nickshatilo Oct 9, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mfn Yep. Fixed in another PR

@nickshatilo nickshatilo Oct 9, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mfn #26022

$column = $this->model->getQualifiedUpdatedAtColumn();
} else {
$column = $this->model->getUpdatedAtColumn();
}

return array_merge($values, [
$column => $this->model->freshTimestampString(),
]);
}

/**
Expand Down
10 changes: 10 additions & 0 deletions src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}