test/hyperf
1
0
Fork 0
mirror of https://gitee.com/hyperf/hyperf.git synced 2024-12-04 12:47:55 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Update addUpdatedAtColumn() and Fixed ModelBuilderTest

Browse Source
This commit is contained in:
huangzhhui 2019-01-25 23:22:34 +08:00
parent ad8013654c
commit 98981bbaa6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/database/src/Model/Builder.php
View File

@ -1146,20 +1146,28 @@ class Builder
/** /**
* Add the "updated at" column to an array of values. * Add the "updated at" column to an array of values.
* *
* @param array $values
* @return array * @return array
*/ */
protected function addUpdatedAtColumn(array $values) protected function addUpdatedAtColumn(array $values)
{ {
if (! $this->model->usesTimestamps()) { if (! $this->model->usesTimestamps() ||
is_null($this->model->getUpdatedAtColumn())) {
return $values; return $values;
} }
$column = $this->qualifyColumn($this->model->getUpdatedAtColumn()); $column = $this->model->getUpdatedAtColumn();
return array_merge( $values = array_merge(
[$column => $this->model->freshTimestampString()], [$column => $this->model->freshTimestampString()],
$values $values
); );
$values[$this->qualifyColumn($column)] = $values[$column];
unset($values[$column]);
return $values;
} }
/** /**