Merge pull request #16 from jr-cologne/jr_fix-#15

Fix bug #15

Author: jr-cologne

composer.json

@@ -19,7 +19,6 @@
     }
   },
   "homepage": "https://github.com/jr-cologne/db-class",
-  "time": "2017-11-11",
   "license": "MIT",
   "authors": [
     {

src/QueryBuilder.php

@@ -183,7 +183,7 @@ protected function formatWhere(array $where) {
     foreach ($where as $column => $value) {
       $where_clause .= "`{$column}` = :where_{$column}";
 
-      if (!empty(next($where))) {
+      if (next($where) !== false) {
         $where_clause .= ' && ';
       }
     }
@@ -223,7 +223,7 @@ protected function formatData(array $data) {
     foreach ($data as $column => $value) {
       $data_string .= "`{$column}` = :{$column}";
 
-      if (!empty(next($data))) {
+      if (next($data) !== false) {
         $data_string .= ', ';
       }
     }