New functionality, bug fix & speed improvement

- added arrayToUpdate multirow
- fixed exportTable2CSV limit bug
- improved multirow detection speed

Author: uzi88

MySQL_wrapper.class.php

@@ -311,8 +311,17 @@ function escape($string, $link = 0) {
 	 */
 	function arrayToUpdate($table, $data, $where = NULL, $limit = 0, $link = 0) {
 		$this->link = $link ? $link : $this->link;
+		if (is_array(reset($data))) {
+			$cols = array();
+			foreach (array_keys($data[0]) as $c) {
+				$cols[] = "`{$c}` = VALUES(`{$c}`)";
+			}
+			return $this->arrayToInsert($table, $data, TRUE, implode(', ', $cols));
+		}
 		$fields = array();
-		foreach ($data as $key => $val) $fields[] = (in_array(strtolower($val), $this->reserved)) ? "`$key` = " . strtoupper($val) : "`$key` = '" . $this->escape($val) . "'";
+		foreach ($data as $key => $val) {
+			$fields[] = (in_array(strtolower($val), $this->reserved)) ? "`$key` = " . strtoupper($val) : "`$key` = '" . $this->escape($val) . "'";
+		}
 		return (!empty($fields)) ? $this->query("UPDATE `{$table}` SET " . implode(', ', $fields) . ($where ? " WHERE {$where}" : NULL) . ($limit ? " LIMIT {$limit}" : NULL) . ";", $this->link) ? $this->affected : FALSE : FALSE;
 	}
 
@@ -326,8 +335,7 @@ function arrayToUpdate($table, $data, $where = NULL, $limit = 0, $link = 0) {
 	 */
 	function arrayToInsert($table, $data, $ignore = FALSE, $duplicateupdate = NULL, $link = 0) {
 		$this->link = $link ? $link : $this->link;
-		$depth = create_function('$a,$callback', '$m = 1; foreach ($a as $v) if (is_array($v)) { $d = $callback($v,$callback) + 1; if ($d > $m) $m = $d; } return $m;');
-		$multirow = ($depth($data, $depth) == 2);
+		$multirow = is_array(reset($data));
 		if ($multirow) {
 			$c = implode('`, `', array_keys($data[0]));
 			$dat = array();
@@ -432,17 +440,16 @@ function exportTable2CSV($table, $file, $columns = '*', $where = NULL, $limit =
 				foreach ($columns as $c)
 					$tableColumnsArr[] = "'{$c}' AS `{$c}`";
 			}
-			$columnsSQL = "SELECT " . implode(', ', $tableColumnsArr) . " UNION ALL ";
+			$columnsSQL = "SELECT " . implode(', ', $tableColumnsArr);
 		}
-			
-		$sql = (($showColumns) ? $columnsSQL : NULL) .
-			   "SELECT " . (is_array($columns) ? '`' . implode('`, `', $columns) . '`' : $columns) . " " . 
+		
+		$sql = "SELECT " . (is_array($columns) ? '`' . implode('`, `', $columns) . '`' : $columns) . " FROM `{$table}`" . ($where ? " WHERE {$where}" : NULL) . ($limit ? " LIMIT {$limit}" : NULL);
+		$sql = (($showColumns) ? "SELECT * FROM ( ( " . $columnsSQL . " ) UNION ALL ( {$sql} ) ) `a` " : "{$sql} ") .
 			   "INTO OUTFILE '{$this->escape($file)}' " . 
 			   "FIELDS TERMINATED BY '{$delimiter}' " .
 			   "OPTIONALLY ENCLOSED BY '{$enclosure}' " .
 			   "ESCAPED BY '{$this->escape($escape)}' " .
-			   "LINES TERMINATED BY '{$newLine}' " .
-			   "FROM `{$table}`" . ($where ? " WHERE {$where}" : NULL) . ($limit ? " LIMIT {$limit}" : NULL) . ";";
+			   "LINES TERMINATED BY '{$newLine}';";
 		return ($this->query($sql, $this->link)) ? $file : FALSE;
 	}
 

example.php

@@ -305,6 +305,27 @@
 if($db->affected){
 	echo "<hr /><strong>Example 11 (array to update)</strong><br />Updated: {$db->affected} row(s).<br />";
 }
+
+// Array data
+// [fealdname] = feald value
+$data = array();
+$data['id'] = 1; // key
+$data['firstname'] = 'foo';
+$data['surname'] = 'bar';
+$data['email'] = '[email protected]';
+$data['date'] = 'now()';
+
+// [fealdname] = feald value
+$data2 = array();
+$data2['id'] = 2; // key 
+$data2['firstname'] = 'Radovana';
+$data2['surname'] = 'Janjic';
+$data2['email'] = '[email protected]';
+$data2['date'] = 'now()';
+
+// $db->arrayToUpdate( ... ) multirow returns TRUE on success
+$db->arrayToUpdate('table', array($data, $data2 /*, $data3 .... */ ));
+
 // More options
 /** Creates an sql string from an associate array
  * @param 	string 		$table 	- Table name
@@ -431,6 +452,8 @@
 $db->exportTable2CSV('table', 'test-2.txt', 'firstname, surname');
 // Export two or more columns using array
 $db->exportTable2CSV('table', 'test-3.txt', array('firstname', 'surname', 'date'));
+// Export all columns where id < 8 and limit 1, 5
+$db->exportTable2CSV('table', 'test-1.txt', '*', 'id < 8', '1,5');
 // More options
 /** Export table data to CSV file.
  * @param 	string 		$table 			- Table name