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

Respect max_allowed_packet in CSV import

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@986 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-08-20 15:05:35 +00:00
parent c5a7e2cbb6
commit cb370a8ab7
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
adminer/select.inc.php
View file

@ -83,24 +83,46 @@ if ($_POST && !$error) {
//! display edit page in case of an error //! display edit page in case of an error
} elseif (is_string($file = get_file("csv_file"))) { } elseif (is_string($file = get_file("csv_file"))) {
$file = preg_replace("~^\xEF\xBB\xBF~", '', $file); //! character set $file = preg_replace("~^\xEF\xBB\xBF~", '', $file); //! character set
$cols = ""; $affected = 0;
$rows = array(); //! packet size $length = 0;
preg_match_all('~("[^"]*"|[^"\\n])+~U', $file, $matches); $result = true;
$query = "INSERT INTO " . idf_escape($_GET["select"]);
$packet_size = $dbh->result($dbh->query("SELECT @@max_allowed_packet"));
$rows = array();
preg_match_all('~("[^"]*"|[^"\\n])+~', $file, $matches);
foreach ($matches[0] as $key => $val) { foreach ($matches[0] as $key => $val) {
$row = array(); $row = array();
preg_match_all('~(("[^"]*")+|[^,]*),~U', "$val,", $matches2); preg_match_all('~(("[^"]*")+|[^,]*),~', "$val,", $matches2);
if (!$key && !array_diff($matches2[1], array_keys($fields))) { //! doesn't work with column names containing ",\n if (!$key && !array_diff($matches2[1], array_keys($fields))) { //! 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 = " (" . implode(", ", array_map('idf_escape', $matches2[1])) . ")"; $query .= " (" . implode(", ", array_map('idf_escape', $matches2[1])) . ")";
} else { } else {
foreach ($matches2[1] as $col) { foreach ($matches2[1] as $col) {
$row[] = (!strlen($col) ? "NULL" : $dbh->quote(str_replace('""', '"', preg_replace('~^"|"$~', '', $col)))); $row[] = (!strlen($col) ? "NULL" : $dbh->quote(str_replace('""', '"', preg_replace('~^"|"$~', '', $col))));
} }
$rows[] = "\n(" . implode(", ", $row) . ")"; $s = "\n(" . implode(", ", $row) . ")";
$length += 1 + strlen($s); // 1 - separator length
if ($rows && $length > $packet_size) {
$result = queries($query . implode(",", $rows));
if (!$result) {
break;
}
$affected += $dbh->affected_rows;
$length = strlen($query);
$rows = array();
}
$rows[] = $s;
}
if (!$key) {
$query .= " VALUES";
$length += strlen($query);
} }
} }
$result = queries("INSERT INTO " . idf_escape($_GET["select"]) . "$cols VALUES" . implode(",", $rows)); if ($result) {
query_redirect(queries(), remove_from_uri("page"), lang('%d row(s) have been imported.', $dbh->affected_rows), $result, false, !$result); $result = queries($query . implode(",", $rows));
$affected += $dbh->affected_rows;
}
query_redirect(queries(), remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result, false, !$result);
} else { } else {
$error = upload_error($file); $error = upload_error($file);
} }

1
changes.txt
View file

@ -1,5 +1,6 @@
Adminer 2.0.1: Adminer 2.0.1:
Display column comments in table overview Display column comments in table overview
Respect max_allowed_packet in CSV import
Fix Editor date format Fix Editor date format
Fix long SQL query crash (bug #2839231) Fix long SQL query crash (bug #2839231)