From 008819cd1e2dc82242007bca84214d89b9096484 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 29 Jan 2012 13:59:50 -0600 Subject: [PATCH] added db method to validator. --- laravel/validator.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/laravel/validator.php b/laravel/validator.php index 33c3cad9..d00b101c 100644 --- a/laravel/validator.php +++ b/laravel/validator.php @@ -415,14 +415,12 @@ protected function validate_not_in($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 // not have the same name as the attribute. It must be within 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); // 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 @@ -770,6 +768,18 @@ public function connection(Database\Connection $connection) 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. */