Skip to content

Fix update method. #10

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix update method. #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
def1ef8
Fix update method.
Dec 23, 2016
0cacf90
Merge remote-tracking branch 'upstream/master'
Dec 23, 2016
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
16 changes: 10 additions & 6 deletions src/BuilderTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,21 @@ public function update(array $values)
// update version table records
$db = $this->model->getConnection();
foreach ($affectedRecords as $record) {
// get versioned values from record
// get current version values
$currentVersionValues = $db->table($this->model->getVersionTable())
->where([
[$this->model->getVersionKeyName(), $record->{$this->model->getKeyName()}],
[$this->model->getVersionColumn(), $record->{$this->model->getLatestVersionColumn()}]
])->first();

// merge current version with updated values to create new version
foreach($this->model->getVersionedAttributeNames() as $key) {
$recordVersionValues[$key] = (isset($versionValues[$key])) ? $versionValues[$key] : $record->{$key};
$recordVersionValues[$key] = (isset($versionValues[$key])) ? $versionValues[$key] : $currentVersionValues->{$key};
}

// merge versioned values from record and input
$recordVersionValues = array_merge($recordVersionValues, $versionValues);

// set version and ref_id
$recordVersionValues[$this->model->getVersionKeyName()] = $record->{$this->model->getKeyName()};
$recordVersionValues[$this->model->getVersionColumn()] = $record->{$this->model->getVersionColumn()}+1;
$recordVersionValues[$this->model->getVersionColumn()] = $record->{$this->model->getLatestVersionColumn()}+1;

// insert new version
if(! $db->table($this->model->getVersionTable())->insert($recordVersionValues)) {
Expand Down