Refactor WHERE clause building loop

1 files changed, 5 insertions, 10 deletions

diff --git a/idiorm.php b/idiorm.php
index 301dde6..dd8c9c4 100644
--- a/idiorm.php
+++ b/idiorm.php
@@ -430,24 +430,19 @@
                 $query[] = $this->raw_where_clause;
                 $this->values = array_merge($this->values, $this->raw_where_parameters);
             } else if (count($this->where) > 0) { // Standard WHERE clauses
-                $query[] = "WHERE";
-                $first = array_shift($this->where);
-                $query[] = join(" ", array(
-                    $first[self::WHERE_COLUMN_NAME],
-                    $first[self::WHERE_OPERATOR],
-                    '?'
-                ));
-                $this->values[] = $first[self::WHERE_VALUE];
+                $where_clauses = array();
 
                 while($where = array_shift($this->where)) {
-                    $query[] = "AND";
-                    $query[] = join(" ", array(
+                    $where_clauses[] = join(" ", array(
                         $where[self::WHERE_COLUMN_NAME],
                         $where[self::WHERE_OPERATOR],
                         '?'
                     ));
                     $this->values[] = $where[self::WHERE_VALUE];
                 }
+
+                $query[] = "WHERE";
+                $query[] = join(" AND ", $where_clauses);
             }
 
             // Add ORDER BY clause(s)