Skip to content
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

Jump to bottom

[5.4] Add whereKey method #16558

Merged
merged 2 commits into from
Nov 26, 2016
Merged

[5.4] Add whereKey method #16558

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5526aec
Add whereKey method
mnabialek Nov 26, 2016
7b54ffa
Apply StyleCi patch
mnabialek Nov 26, 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
23 changes: 18 additions & 5 deletions src/Illuminate/Database/Eloquent/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,7 @@ public function find($id, $columns = ['*'])
return $this->findMany($id, $columns);
}

$this->query->where($this->model->getQualifiedKeyName(), '=', $id);

return $this->first($columns);
return $this->whereKey($id)->first($columns);
}

/**
Expand All @@ -184,9 +182,24 @@ public function findMany($ids, $columns = ['*'])
return $this->model->newCollection();
}

$this->query->whereIn($this->model->getQualifiedKeyName(), $ids);
return $this->whereKey($ids)->get($columns);
}

/**
* Add where clause with primary key to the query.
*
* @param mixed $id
* @return $this
*/
public function whereKey($id)
{
if (is_array($id)) {
$this->query->whereIn($this->model->getQualifiedKeyName(), $id);

return $this;
}

return $this->get($columns);
return $this->where($this->model->getQualifiedKeyName(), '=', $id);
}

/**
Expand Down