beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix hitting backtrack limit in import (thanks to Tomas Votruba)

Browse source
This commit is contained in:
Jakub Vrana 2012-12-15 22:07:42 -08:00
parent 0ac5a666b4
commit ab20c18c2e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adminer/select.inc.php
View file

@ -171,7 +171,7 @@ if ($_POST && !$error) {
begin(); begin();
$separator = ($_POST["separator"] == "csv" ? "," : ($_POST["separator"] == "tsv" ? "\t" : ";")); $separator = ($_POST["separator"] == "csv" ? "," : ($_POST["separator"] == "tsv" ? "\t" : ";"));
foreach ($matches[0] as $key => $val) { 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 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 // first row corresponds to column names - use it for table structure
$cols = $matches2[1]; $cols = $matches2[1];

1
changes.txt
View file

@ -1,6 +1,7 @@
Adminer 3.6.2-dev: Adminer 3.6.2-dev:
Edit values by Ctrl+click instead of double click Edit values by Ctrl+click instead of double click
Don't select row on double click Don't select row on double click
Support NULL in routine calls
Shorten printed values in varchar fields Shorten printed values in varchar fields
Display table default values on wide screens Display table default values on wide screens
Display date in SQL history Display date in SQL history