Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added back support for specifying column in validator unique rule. id is now a third parameter option.

This commit is contained in:
Taylor Otwell 2012-01-29 13:19:47 -06:00
parent 1ec6fc766c
commit 1fc861026a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
laravel/validator.php
View File

@ -417,11 +417,19 @@ protected function validate_unique($attribute, $value, $parameters)
{ {
if (is_null($this->db)) $this->db = Database::connection(); if (is_null($this->db)) $this->db = Database::connection();
// We allow the table column to be specified just in case the column does
// not have the same name as the attribute. It must be in the second
// parameter position, right after the databse table name.
if (isset($parameters[1])) $attribute = $parameters[1];
$query = $this->db->table($parameters[0])->where($attribute, '=', $value); $query = $this->db->table($parameters[0])->where($attribute, '=', $value);
if (isset($parameters[1])) // We also allow an ID to be specified that will not be included in the
// uniqueness check. This makes updating columns easier since it is
// fine for the given ID to exist in the table.
if (isset($parameters[2]))
{ {
$query->where('id', '<>', $parameters[1]); $query->where('id', '<>', $parameters[2]);
} }
return $query->count() == 0; return $query->count() == 0;