From 25c78b8c55320e1578c69020b270bb97efe76d37 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 22 Aug 2011 22:14:11 -0500 Subject: [PATCH] refactoring query compiler. --- .gitignore | 1 + gitflow | 1 + laravel/db/query/compiler.php | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 160000 gitflow diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..38587e67 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +gitflow/* diff --git a/gitflow b/gitflow new file mode 160000 index 00000000..be5dabf8 --- /dev/null +++ b/gitflow @@ -0,0 +1 @@ +Subproject commit be5dabf88e98075b9bc936bfa7de0f54a21a0482 diff --git a/laravel/db/query/compiler.php b/laravel/db/query/compiler.php index f6b306d2..891c7138 100644 --- a/laravel/db/query/compiler.php +++ b/laravel/db/query/compiler.php @@ -31,9 +31,7 @@ public function select(Query $query) if ( ! is_null($query->$clause)) $sql[] = call_user_func(array($this, 'compile_'.$clause), $query->$clause); } - foreach ($sql as $key => $value) { if (is_null($value) or (string) $value === '') unset($sql[$key]); } - - return implode(' ', $sql); + return implode(' ', array_filter($sql, function($value) { return ! is_null($value) and (string) $value !== ''; })); } /**