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

Support same name fields in CSV export

Browse source
This commit is contained in:
Jakub Vrana 2012-08-09 08:57:45 -07:00
parent 7fcfb0d16a
commit 69d49e30c5
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
adminer/include/adminer.inc.php
View file

@ -672,25 +672,32 @@ DROP PROCEDURE adminer_alter;
if ($result) {
$insert = "";
$buffer = "";
while ($row = $result->fetch_assoc()) {
$keys = array();
while ($row = $result->fetch_row()) {
if (!$keys) {
foreach ($row as $val) {
$field = $result->fetch_field();
$keys[] = $field->name;
}
}
if ($_POST["format"] != "sql") {
if ($style == "table") {
dump_csv(array_keys($row));
dump_csv($keys);
$style = "INSERT";
}
dump_csv($row);
} else {
if (!$insert) {
$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
}
foreach ($row as $key => $val) {
$row[$key] = ($val !== null ? (ereg('int|float|double|decimal|bit', $fields[$key]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions
$row[$key] = ($val !== null ? (ereg('int|float|double|decimal|bit', $fields[$keys[$key]]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions
}
$s = implode(",\t", $row);
if ($style == "INSERT+UPDATE") {
$set = array();
foreach ($row as $key => $val) {
$set[] = idf_escape($key) . " = $val";
$set[] = idf_escape($keys[$key]) . " = $val";
}
echo "$insert ($s) ON DUPLICATE KEY UPDATE " . implode(", ", $set) . ";\n";
} else {

2
changes.txt
View file

@ -1,4 +1,6 @@
Adminer 3.5.1-dev:
Support same name fields in CSV export
Support Shift+click in export
Adminer 3.5.0 (released 2012-08-05):
Links for column search in select