Don't quote comma in TSV export (fix #1238)

vrana · vrana · commit e4ac9d611e8b · 2026-02-08T09:01:52.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Display uneditable fields in edit form
 - Shorten all but numeric and date types in select
 - Fix escaping spaces in cookie value (bug #1208)
+- Don't quote comma in TSV export (bug #1238)
 - MariaDB: don't display checks with the same name from another table (bug #1135)
 - PostgreSQL: Offer foreign keys in create table
 - PostgreSQL: Add missing parentheses to CHECK export
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
@@ -651,12 +651,13 @@ function dump_headers(string $identifier, bool $multi_table = false): string {
 * @param string[] $row
 */
 function dump_csv(array $row): void {
+	$tsv = $_POST["format"] == "tsv";
 	foreach ($row as $key => $val) {
-		if (preg_match('~["\n,;\t]|^0.|\.\d*0$~', $val) || $val === "") {
+		if (preg_match('~["\n]|^0[^.]|\.\d*0$|' . ($tsv ? '\t' : '[,;]|^$') . '~', $val)) {
 			$row[$key] = '"' . str_replace('"', '""', $val) . '"';
 		}
 	}
-	echo implode(($_POST["format"] == "csv" ? "," : ($_POST["format"] == "tsv" ? "\t" : ";")), $row) . "\r\n";
+	echo implode(($_POST["format"] == "csv" ? "," : ($tsv ? "\t" : ";")), $row) . "\r\n";
 }
 
 /** Apply SQL function

Original file line number	Diff line number	Diff line change
`@@ -651,12 +651,13 @@ function dump_headers(string $identifier, bool $multi_table = false): string {`
`651`	`651`	`* @param string[] $row`
`652`	`652`	`*/`
`653`	`653`	`function dump_csv(array $row): void {`
	`654`	`+ $tsv = $_POST["format"] == "tsv";`
`654`	`655`	`foreach ($row as $key => $val) {`
`655`		`- if (preg_match('~["\n,;\t]\|^0.\|\.\d*0$~', $val) \|\| $val === "") {`
	`656`	`+ if (preg_match('~["\n]\|^0[^.]\|\.\d*0$\|' . ($tsv ? '\t' : '[,;]\|^$') . '~', $val)) {`
`656`	`657`	`$row[$key] = '"' . str_replace('"', '""', $val) . '"';`
`657`	`658`	`}`
`658`	`659`	`}`
`659`		`- echo implode(($_POST["format"] == "csv" ? "," : ($_POST["format"] == "tsv" ? "\t" : ";")), $row) . "\r\n";`
	`660`	`+ echo implode(($_POST["format"] == "csv" ? "," : ($tsv ? "\t" : ";")), $row) . "\r\n";`
`660`	`661`	`}`
`661`	`662`
`662`	`663`	`/** Apply SQL function`