Improved functionalities

- fetchQueryToArray (added fetch first row)
- arrayToInsert (added multirow insert)
- added current_timestamp to reserved words

Author: uzi88

MySQL_wrapper.class.php

@@ -114,7 +114,7 @@ class MySQL_wrapper {
 	/** Reserved words for array to ( insert / update )
 	 * @var array
 	 */
-	var $reserved = array('null', 'now()', 'curtime()', 'localtime()', 'localtime', 'utc_date()', 'utc_time()', 'utc_timestamp()');
+	var $reserved = array('null', 'now()', 'current_timestamp', 'curtime()', 'localtime()', 'localtime', 'utc_date()', 'utc_time()', 'utc_timestamp()');
 
 	/** Constructor
 	 * @param 	string 		$server		- MySQL Host name 
@@ -267,14 +267,26 @@ function fetchArray($query = 0) {
 
 	/** Returns array with fetched associative rows.
 	 * @param 	string 		$sql 		- MySQL Query
+	 * @param 	string 		$fetchFirst	- Fetch only first row
 	 * @param 	resource 	$link 		- Link identifier
 	 * @return 	array
 	 */
-	function fetchQueryToArray($sql, $link = 0) {
-		$this->link = $link ? $link : $this->link;
+	function fetchQueryToArray($sql, $fetchFirst = FALSE, $link = 0) {
+		$this->link = $link ? $link : $this->link; 
+		if ($fetchFirst) {
+			$sql = rtrim(trim($sql), ';');
+			$sql = preg_replace('/limit(([\s]+([\d]+)[\s]*,[\s]*([\d]+))|([\s]+([\d]+)))$/i', 'LIMIT 1;', $sql);
+			if (substr($sql, -strlen('LIMIT 1;')) !== 'LIMIT 1;') {
+				$sql .= ' LIMIT 1;';
+			}
+		}
 		$q = $this->query($sql, $this->link);
 		$array = array();
-		while ($row = $this->fetchArray($q)) $array[] = $row;
+		if ($fetchFirst && $this->affected > 0) {
+			$array = $this->fetchArray($q);
+		} else {
+			while ($row = $this->fetchArray($q)) $array[] = $row;
+		}
 		$this->freeResult($q);
 		return $array;
 	}
@@ -306,16 +318,32 @@ function arrayToUpdate($table, $data, $where = NULL, $limit = 0, $link = 0) {
 
 	/** Creates an sql string from an associate array
 	 * @param 	string 		$table 	- Table name
-	 * @param 	array 		$data 	- Data array Eg. $data['column'] = 'val';
+	 * @param 	array 		$data 	- Data array Eg. array('column' => 'val') or multirows array(array('column' => 'val'), array('column' => 'val2'))
 	 * @param 	boolean		$ingore	- INSERT IGNORE (row won't actually be inserted if it results in a duplicate key)
 	 * @param 	string 		$duplicateupdate 	- ON DUPLICATE KEY UPDATE (The ON DUPLICATE KEY UPDATE clause can contain multiple column assignments, separated by commas.)
 	 * @param 	resource 	$link 	- link identifier
 	 * @return 	insert id or false
 	 */
 	function arrayToInsert($table, $data, $ignore = FALSE, $duplicateupdate = NULL, $link = 0) {
 		$this->link = $link ? $link : $this->link;
-		foreach ($data as &$val) $val = (in_array(strtolower($val), $this->reserved)) ? strtoupper($val) : "'" . $this->escape($val) . "'";
-		return (!empty($data)) ? $this->query("INSERT" . ($ignore ? " IGNORE" : NULL) . " INTO `{$table}` ( `" . implode('`, `', array_keys($data)) . "` ) VALUES ( " . implode(', ', array_values($data)) . " )" . ($duplicateupdate ? " ON DUPLICATE KEY UPDATE {$duplicateupdate}" : NULL) . ";") ? $this->insertId($this->link) : FALSE : FALSE;
+		$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);
+		if ($multirow) {
+			$c = implode('`, `', array_keys($data[0]));
+			$dat = array();
+			foreach ($data as &$val) {
+				foreach ($val as &$v) {
+					$v = (in_array(strtolower($v), $this->reserved)) ? strtoupper($v) : "'" . $this->escape($v) . "'";
+				}
+				$dat[] = "( " . implode(', ', $val) . " )";
+			}
+			$v = implode(', ', $dat);
+		} else {
+			$c = implode('`, `', array_keys($data));
+			foreach ($data as &$val) $val = (in_array(strtolower($val), $this->reserved)) ? strtoupper($val) : "'" . $this->escape($val) . "'";
+			$v = "( " . implode(', ', $data) . " )";
+		}
+		return (!empty($data)) ? $this->query("INSERT" . ($ignore ? " IGNORE" : NULL) . " INTO `{$table}` ( `{$c}` ) VALUES {$v}" . ($duplicateupdate ? " ON DUPLICATE KEY UPDATE {$duplicateupdate}" : NULL) . ";") ? ($multirow ? TRUE : $this->insertId($this->link)) : FALSE : FALSE;
 	}
 
 	/** Imports CSV data to Table with possibility to update rows while import.

example.php

@@ -17,7 +17,6 @@
 define('DB', 'test');
 
 
-
 // create test table
 $db = new MySQL_wrapper(HOST, USER, PASS, DB);
 $db->connect();
@@ -138,6 +137,9 @@
 $db->connect();
 echo "<hr /><strong>Example 5 (fetch query to array)</strong><pre>";
 print_r($db->fetchQueryToArray('SELECT * FROM `table`'));
+
+// Returns only first row
+print_r($db->fetchQueryToArray('SELECT * FROM `table`', TRUE));
 echo "</pre>";
 $db->close();
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -236,9 +238,27 @@
 
 // $db->arrayToInsert( ... ) returns insert id
 $insert_id = $db->arrayToInsert('table', $data);
-$insert_id = $db->arrayToInsert('table', $data);
 echo "<hr /><strong>Example 9 (array to insert)</strong><br />Last insert id is: {$insert_id}<br />";
 
+// Array data
+// [fealdname] = feald value
+$data = array();
+$data['firstname'] = 'Radovan';
+$data['surname'] = 'Janjic';
+$data['email'] = 'rade@it-radionica.com';
+$data['date'] = 'now()';
+
+// [fealdname] = feald value
+$data2 = array();
+$data2['firstname'] = 'Radovan';
+$data2['surname'] = 'Janjic';
+$data2['email'] = 'rade@it-radionica.com';
+$data2['date'] = 'now()';
+
+// $db->arrayToInsert( ... ) multirow returns TRUE on success
+$db->arrayToInsert('table', array($data, $data2 /*, $data3 .... */ ));
+
+
 // More options
 /** Creates an sql string from an associate array
  * @param 	string 		$table 	- Table name