FIXED: Limit with offset bug in query2CSV

Author: uzi88

MySQL_wrapper.class.php

@@ -408,7 +408,7 @@ function importCSV2Table($file, $table, $delimiter = ',', $enclosure = '"', $esc
 	 */
 	function exportTable2CSV($table, $file, $columns = '*', $where = NULL, $limit = 0, $delimiter = ',', $enclosure = '"', $escape = '\\', $newLine = '\n', $showColumns = TRUE, $link = 0) {
 		$this->link = $link ? $link : $this->link;
-		$fh = fopen($file, 'w') or ($this->logErrors) ? $this->log("ERROR", "Can't create CSV file.") : FALSE;
+		$fh = fopen($file, 'w') or ($this->logErrors) ? $this->log("ERROR", "Can't create CSV file: {$file}") : FALSE;
 		fclose($fh);
 		$file = realpath($file);
 		unlink($file);
@@ -459,7 +459,7 @@ function exportTable2CSV($table, $file, $columns = '*', $where = NULL, $limit =
 	 */
 	function query2CSV($sql, $file, $delimiter = ',', $enclosure = '"', $escape = '\\', $newLine = '\n', $showColumns = TRUE, $link = 0) {
 		$this->link = $link ? $link : $this->link;
-		$fh = fopen($file, 'w') or ($this->logErrors) ? $this->log("ERROR", "Can't create CSV file.") : FALSE;
+		$fh = fopen($file, 'w') or ($this->logErrors) ? $this->log("ERROR", "Can't create CSV file: {$file}") : FALSE;
 		fclose($fh);
 		$file = realpath($file);
 		unlink($file);
@@ -476,11 +476,14 @@ function query2CSV($sql, $file, $delimiter = ',', $enclosure = '"', $escape = '\
 				foreach ($columns as $k => $v) {
 					$tableColumnsArr[] = "'{$k}' AS `{$k}`";
 				}
-				$columnsSQL = "SELECT " . implode(', ', $tableColumnsArr) . " UNION ALL ";
+				$columnsSQL = "SELECT " . implode(', ', $tableColumnsArr);
+			} else {
+				// No results for this query
+				return 0;
 			}
 		}
 		// Final query
-		$sql = (($showColumns) ? $columnsSQL : NULL) . "{$sql} " .
+		$sql = (($showColumns && isset($columnsSQL)) ? "SELECT * FROM ( ( " . $columnsSQL . " ) UNION ALL ( {$sql} ) ) `a` " : "{$sql} ") .
 			   "INTO OUTFILE '{$this->escape($file)}' " .
 			   "FIELDS TERMINATED BY '{$delimiter}' " .
 			   "OPTIONALLY ENCLOSED BY '{$enclosure}' " .

example.php

@@ -472,6 +472,9 @@
 // function query2CSV($sql, $file, $delimiter = ',', $enclosure = '"', $escape = '\\', $newLine = '\n', $showColumns = TRUE, $link = 0)
 $path = $db->query2CSV('select * from `table` limit 10', 'test-query2csv.csv');
 echo '<hr /><pre>Query exported to CSV file: ', $path, '</pre>';
+
+// example 2
+$path = $db->query2CSV('select * from `table` limit 2,2', 'test-query2csv.csv');
 // Close connection
 $db->close();
 ///////////////////////////////////////////////////////////////////////////////////////////