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

Timestamp in export

Browse source
This commit is contained in:
Jakub Vrana 2010-10-22 21:27:53 +02:00
parent b3c8d71163
commit 3da0f3be13
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
adminer/dump.inc.php
View file

@ -8,7 +8,8 @@ if ($_POST) {
} }
cookie("adminer_export", substr($cookie, 1)); cookie("adminer_export", substr($cookie, 1));
$ext = dump_headers(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1)); $ext = dump_headers(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1));
if ($_POST["format"] == "sql") { $is_sql = ($_POST["format"] == "sql");
if ($is_sql) {
echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump
" . ($jush != "sql" ? "" : "SET NAMES utf8; " . ($jush != "sql" ? "" : "SET NAMES utf8;
@ -29,13 +30,13 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
} }
foreach ((array) $databases as $db) { foreach ((array) $databases as $db) {
if ($connection->select_db($db)) { if ($connection->select_db($db)) {
if ($_POST["format"] == "sql" && ereg('CREATE', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) { if ($is_sql && ereg('CREATE', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
if ($style == "DROP+CREATE") { if ($style == "DROP+CREATE") {
echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n"; echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n";
} }
echo ($style == "CREATE+ALTER" ? preg_replace('~^CREATE DATABASE ~', '\\0IF NOT EXISTS ', $create) : $create) . ";\n"; echo ($style == "CREATE+ALTER" ? preg_replace('~^CREATE DATABASE ~', '\\0IF NOT EXISTS ', $create) : $create) . ";\n";
} }
if ($_POST["format"] == "sql") { if ($is_sql) {
if ($style) { if ($style) {
echo use_sql($db) . ";\n\n"; echo use_sql($db) . ";\n\n";
} }
@ -76,7 +77,7 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
if ($data) { if ($data) {
dump_data($row["Name"], $_POST["data_style"]); dump_data($row["Name"], $_POST["data_style"]);
} }
if ($_POST["format"] == "sql" && $_POST["triggers"]) { if ($is_sql && $_POST["triggers"]) {
$triggers = trigger_sql($row["Name"], $_POST["table_style"]); $triggers = trigger_sql($row["Name"], $_POST["table_style"]);
if ($triggers) { if ($triggers) {
echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n"; echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
@ -84,10 +85,10 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
} }
if ($ext == "tar") { if ($ext == "tar") {
echo tar_file((DB != "" ? "" : "$db/") . "$row[Name].csv", ob_get_clean()); echo tar_file((DB != "" ? "" : "$db/") . "$row[Name].csv", ob_get_clean());
} elseif ($_POST["format"] == "sql") { } elseif ($is_sql) {
echo "\n"; echo "\n";
} }
} elseif ($_POST["format"] == "sql") { } elseif ($is_sql) {
$views[] = $row["Name"]; $views[] = $row["Name"];
} }
} }
@ -100,7 +101,7 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
} }
} }
if ($style == "CREATE+ALTER" && $_POST["format"] == "sql") { if ($style == "CREATE+ALTER" && $is_sql) {
// drop old tables // drop old tables
$query = "SELECT TABLE_NAME, ENGINE, TABLE_COLLATION, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()"; $query = "SELECT TABLE_NAME, ENGINE, TABLE_COLLATION, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()";
echo "DELIMITER ;; echo "DELIMITER ;;
@ -136,11 +137,14 @@ CALL adminer_alter(@adminer_alter);
DROP PROCEDURE adminer_alter; DROP PROCEDURE adminer_alter;
"; ";
} }
if (in_array("CREATE+ALTER", array($style, $_POST["table_style"])) && $_POST["format"] == "sql") { if (in_array("CREATE+ALTER", array($style, $_POST["table_style"])) && $is_sql) {
echo "SELECT @adminer_alter;\n"; echo "SELECT @adminer_alter;\n";
} }
} }
} }
if ($is_sql) {
echo "-- " . $connection->result("SELECT NOW()") . "\n";
}
exit; exit;
} }

1
changes.txt
View file

@ -2,6 +2,7 @@ Adminer 3.0.2-dev:
Option to show only errors in SQL command Option to show only errors in SQL command
Highlight and edit SQL command in processlist Highlight and edit SQL command in processlist
Disable XSS "protection" of IE8 Disable XSS "protection" of IE8
Timestamp in export
Immunity against zend.ze1_compatibility_mode Immunity against zend.ze1_compatibility_mode
Fix last page with empty result set Fix last page with empty result set