Fix hitting backtrack limit in import (thanks to Tomas Votruba)
This commit is contained in:
parent
0ac5a666b4
commit
ab20c18c2e
|
@ -171,7 +171,7 @@ if ($_POST && !$error) {
|
|||
begin();
|
||||
$separator = ($_POST["separator"] == "csv" ? "," : ($_POST["separator"] == "tsv" ? "\t" : ";"));
|
||||
foreach ($matches[0] as $key => $val) {
|
||||
preg_match_all("~((\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
|
||||
preg_match_all("~((?>\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
|
||||
if (!$key && !array_diff($matches2[1], $cols)) { //! doesn't work with column names containing ",\n
|
||||
// first row corresponds to column names - use it for table structure
|
||||
$cols = $matches2[1];
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
Adminer 3.6.2-dev:
|
||||
Edit values by Ctrl+click instead of double click
|
||||
Don't select row on double click
|
||||
Support NULL in routine calls
|
||||
Shorten printed values in varchar fields
|
||||
Display table default values on wide screens
|
||||
Display date in SQL history
|
||||
|
|
Loading…
Reference in a new issue