Update Database.php

Merge array of $data and $where in update will result in omitted data if $data and $where fields have the same columns.

Updated to append all passed values, so same columns in $data and $where will now use both values.

Author: DizzySquirrel

src/Database.php

@@ -193,29 +193,28 @@ public function insert($table, $data)
      */
     public function update($table, $data, $where)
     {
-        //merge data and where together
-        $collection = array_merge($data, $where);
-
-        //collect the values from collection
-        $values = array_values($collection);
-
+        //collect the values from data and where
+        $values = [];
+        
         //setup fields
         $fieldDetails = null;
         foreach ($data as $key => $value) {
             $fieldDetails .= "$key = ?,";
+            $values[] = $value;
         }
         $fieldDetails = rtrim($fieldDetails, ',');
-
+        
         //setup where 
         $whereDetails = null;
         $i = 0;
         foreach ($where as $key => $value) {
             $whereDetails .= $i == 0 ? "$key = ?" : " AND $key = ?";
+            $values[] = $value;
             $i++;
         }
-
+        
         $stmt = $this->run("UPDATE $table SET $fieldDetails WHERE $whereDetails", $values);
-
+        
         return $stmt->rowCount();
     }