From f507c81863cda241ee9e27a60beb280ac5aebf83 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Mon, 1 Jun 2009 12:53:19 +0000 Subject: [PATCH] Simplify export git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@637 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- dump.inc.php | 59 ++++++++++++++++++++++++------------------ include/export.inc.php | 22 ++++++++-------- 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/dump.inc.php b/dump.inc.php index 783ea7ba..98a8db0a 100644 --- a/dump.inc.php +++ b/dump.inc.php @@ -10,7 +10,7 @@ function tar_file($filename, $contents) { } if ($_POST) { - $ext = dump_headers((strlen($_GET["dump"]) ? $_GET["dump"] : $_GET["db"]), (!strlen($_GET["db"]) || count(array_filter((array) $_POST["tables"]) + array_filter((array) $_POST["data"])) > 1)); + $ext = dump_headers((strlen($_GET["dump"]) ? $_GET["dump"] : $_GET["db"]), (!strlen($_GET["db"]) || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1)); if ($_POST["format"] != "csv") { $max_packet = 1048576; // default, minimum is 1024 echo "SET NAMES utf8;\n"; @@ -19,15 +19,15 @@ if ($_POST) { echo "\n"; } - foreach ($_POST["databases"] as $db => $style) { - $db = bracket_escape($db, "back"); + $style = $_POST["db_style"]; + foreach ((strlen($_GET["db"]) ? array($_GET["db"]) : (array) $_POST["databases"]) as $db) { if ($dbh->select_db($db)) { if ($_POST["format"] != "csv" && ereg('CREATE', $style) && ($result = $dbh->query("SHOW CREATE DATABASE " . idf_escape($db)))) { - if ($style == "DROP, CREATE") { + if ($style == "DROP+CREATE") { echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n"; } $create = $dbh->result($result, 1); - 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"; $result->free(); } if ($style && $_POST["format"] != "csv") { @@ -52,35 +52,38 @@ if ($_POST) { echo ($out ? "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n" : ""); } - if (($style || strlen($_GET["db"])) && (array_filter((array) $_POST["tables"]) || array_filter((array) $_POST["data"]))) { + if ($_POST["table_style"] || $_POST["data_style"]) { $views = array(); $result = $dbh->query("SHOW TABLE STATUS"); while ($row = $result->fetch_assoc()) { - $key = (strlen($_GET["db"]) ? bracket_escape($row["Name"]) : 0); - if ($_POST["tables"][$key] || $_POST["data"][$key]) { + $table = (!strlen($_GET["db"]) || in_array($row["Name"], (array) $_POST["tables"])); + $data = (!strlen($_GET["db"]) || in_array($row["Name"], (array) $_POST["data"])); + if ($table || $data) { if (isset($row["Engine"])) { if ($ext == "tar") { ob_start(); } - dump_table($row["Name"], $_POST["tables"][$key]); - dump_data($row["Name"], $_POST["data"][$key]); + dump_table($row["Name"], ($table ? $_POST["table_style"] : "")); + if ($data) { + dump_data($row["Name"], $_POST["data_style"]); + } if ($ext == "tar") { echo tar_file((strlen($_GET["db"]) ? "" : "$db/") . "$row[Name].csv", ob_get_clean()); } elseif ($_POST["format"] != "csv") { echo "\n"; } } elseif ($_POST["format"] != "csv") { - $views[$row["Name"]] = $_POST["tables"][$key]; + $views[] = $row["Name"]; } } } $result->free(); - foreach ($views as $view => $style1) { - dump_table($view, $style1, true); + foreach ($views as $view) { + dump_table($view, $_POST["table_style"], true); } } - if ($dbh->server_info >= 5 && $style == "CREATE, ALTER" && $_POST["format"] != "csv") { + if ($style == "CREATE+ALTER" && $_POST["format"] != "csv") { $query = "SELECT TABLE_NAME, ENGINE, TABLE_COLLATION, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()"; ?> DELIMITER ;; @@ -131,23 +134,30 @@ page_header(lang('Export'), "", (strlen($_GET["export"]) ? array("table" => $_GE ?>
- +
server_info >= 5) { + $db_style[] = 'CREATE+ALTER'; + $table_style[] = 'CREATE+ALTER'; +} echo "\n"; echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; // INSERT INTO ... ON DUPLICATE KEY UPDATE +echo "\n"; +echo "\n"; +echo "\n"; ?>
" . lang('Output') . "$dump_output
" . lang('Format') . "$dump_format
" . lang('Database') . "
" . lang('Tables') . "
" . lang('Data') . "
" . lang('Database') . "
" . lang('Tables') . "
" . lang('Data') . "

\n" . lang('Database') . "\n"; + echo "\n\n"; foreach (get_databases() as $db) { if ($db != "information_schema" || $dbh->server_info < 5) { - echo '\n"; //! uncheck all + echo '\n"; } } echo "
\n"; @@ -156,22 +166,21 @@ if (!strlen($_GET["db"])) { if (strlen($_GET["db"])) { $checked = (strlen($_GET["dump"]) ? "" : " checked='checked'"); echo "\n"; - echo ""; - echo ""; + echo ""; + echo ""; echo "\n"; $views = ""; $result = $dbh->query("SHOW TABLE STATUS"); while ($row = $result->fetch_assoc()) { $checked = (strlen($_GET["dump"]) && $row["Name"] != $_GET["dump"] ? '' : " checked='checked'"); - $print = '"; //! uncheck all + $print = '"; if (!$row["Engine"]) { $views .= "$print\n"; } else { - echo $print . '\n"; + echo "$print\n"; } } echo "$views
\n"; } ?> -

diff --git a/include/export.inc.php b/include/export.inc.php index f8357684..ca706dc3 100644 --- a/include/export.inc.php +++ b/include/export.inc.php @@ -18,16 +18,15 @@ function dump_table($table, $style, $is_view = false) { } elseif ($style) { $result = $dbh->query("SHOW CREATE TABLE " . idf_escape($table)); if ($result) { - if ($style == "DROP, CREATE") { + if ($style == "DROP+CREATE") { echo "DROP " . ($is_view ? "VIEW" : "TABLE") . " IF EXISTS " . idf_escape($table) . ";\n"; } $create = $dbh->result($result, 1); $result->free(); - echo ($style != "CREATE, ALTER" ? $create : ($is_view ? substr_replace($create, " OR REPLACE", 6, 0) : substr_replace($create, " IF NOT EXISTS", 12, 0))) . ";\n\n"; + echo ($style != "CREATE+ALTER" ? $create : ($is_view ? substr_replace($create, " OR REPLACE", 6, 0) : substr_replace($create, " IF NOT EXISTS", 12, 0))) . ";\n\n"; } - if ($dbh->server_info >= 5) { - if ($style == "CREATE, ALTER" && !$is_view) { - $query = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, COLLATION_NAME, COLUMN_TYPE, EXTRA, COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '" . $dbh->escape_string($table) . "' ORDER BY ORDINAL_POSITION"; + if ($style == "CREATE+ALTER" && !$is_view) { + $query = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, COLLATION_NAME, COLUMN_TYPE, EXTRA, COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '" . $dbh->escape_string($table) . "' ORDER BY ORDINAL_POSITION"; ?> DELIMITER ;; CREATE PROCEDURE phpminadmin_alter () BEGIN @@ -100,9 +99,10 @@ CALL phpminadmin_alter; DROP PROCEDURE phpminadmin_alter; server_info >= 5) { $result = $dbh->query("SHOW TRIGGERS LIKE '" . $dbh->escape_string(addcslashes($table, "%_")) . "'"); if ($result->num_rows) { echo "DELIMITER ;;\n\n"; @@ -119,7 +119,7 @@ DROP PROCEDURE phpminadmin_alter; function dump_data($table, $style, $from = "") { global $dbh, $max_packet; if ($style) { - if ($_POST["format"] != "csv" && $style == "TRUNCATE, INSERT") { + if ($_POST["format"] != "csv" && $style == "TRUNCATE+INSERT") { echo "TRUNCATE " . idf_escape($table) . ";\n"; } $result = $dbh->query("SELECT * " . ($from ? $from : "FROM " . idf_escape($table))); //! enum and set as numbers, binary as _binary, microtime @@ -129,7 +129,7 @@ function dump_data($table, $style, $from = "") { while ($row = $result->fetch_assoc()) { if ($_POST["format"] == "csv") { dump_csv($row); - } elseif ($style == "UPDATE") { + } elseif ($style == "INSERT+UPDATE") { $set = array(); foreach ($row as $key => $val) { $row[$key] = (isset($val) ? "'" . $dbh->escape_string($val) . "'" : "NULL"); @@ -155,7 +155,7 @@ function dump_data($table, $style, $from = "") { } } } - if ($_POST["format"] != "csv" && $style != "UPDATE" && $result->num_rows) { + if ($_POST["format"] != "csv" && $style != "INSERT+UPDATE" && $result->num_rows) { echo ";\n"; } $result->free();