Commit 008819cd authored by Taylor Otwell's avatar Taylor Otwell

added db method to validator.

parent 3488a544
...@@ -415,14 +415,12 @@ class Validator { ...@@ -415,14 +415,12 @@ class Validator {
*/ */
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 @@ class Validator { ...@@ -770,6 +768,18 @@ class Validator {
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.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment