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

added db method to validator.

This commit is contained in:
Taylor Otwell 2012-01-29 13:59:50 -06:00
parent 3488a5449e
commit 008819cd1e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
laravel/validator.php
View File

@ -415,14 +415,12 @@ protected function validate_not_in($attribute, $value, $parameters)
*/ */
protected function validate_unique($attribute, $value, $parameters) protected function validate_unique($attribute, $value, $parameters)
{ {
if (is_null($this->db)) $this->db = Database::connection();
// We allow the table column to be specified just in case the column does // 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 within the second // not have the same name as the attribute. It must be within the second
// parameter position, right after the databse table name. // parameter position, right after the databse table name.
if (isset($parameters[1])) $attribute = $parameters[1]; 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);
// We also allow an ID to be specified that will not be included in the // 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 // uniqueness check. This makes updating columns easier since it is
@ -770,6 +768,18 @@ public function connection(Database\Connection $connection)
return $this; return $this;
} }
/**
* Get the database connection for the Validator.
*
* @return Connection
*/
protected function db()
{
if ( ! is_null($this->db)) return $this->db;
return $this->db = Database::connection();
}
/** /**
* Dynamically handle calls to custom registered validators. * Dynamically handle calls to custom registered validators.
*/ */