From f46a3deab6ae3ecc7cf47ce4a8b0a4c379df8d9d Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 7 Nov 2011 13:24:22 -0600 Subject: [PATCH] Clean-up the default database grammar. --- laravel/database/grammars/grammar.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/laravel/database/grammars/grammar.php b/laravel/database/grammars/grammar.php index 3cd2e8be..aa7b8648 100644 --- a/laravel/database/grammars/grammar.php +++ b/laravel/database/grammars/grammar.php @@ -161,7 +161,9 @@ final protected function wheres(Query $query) */ protected function where($where) { - return $this->wrap($where['column']).' '.$where['operator'].' '.$this->parameter($where['value']); + $parameter = $this->parameter($where['value']); + + return $this->wrap($where['column']).' '.$where['operator'].' '.$parameter; } /** @@ -172,7 +174,9 @@ protected function where($where) */ protected function where_in($where) { - return $this->wrap($where['column']).' IN ('.$this->parameterize($where['values']).')'; + $parameters = $this->parameterize($where['values']); + + return $this->wrap($where['column']).' IN ('.$parameters.')'; } /** @@ -183,7 +187,9 @@ protected function where_in($where) */ protected function where_not_in($where) { - return $this->wrap($where['column']).' NOT IN ('.$this->parameterize($where['values']).')'; + $parameters = $this->parameterize($where['values']); + + return $this->wrap($where['column']).' NOT IN ('.$parameters.')'; } /**