From 122252ed4abeb3f2545949021c775ac5b6e1d5c9 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 25 Sep 2009 11:29:46 +0000 Subject: [PATCH] Routines and events checkboxes (thanks to cvicebni ubor) git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1146 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/dump.inc.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php index a90c44a0..c3c2e80f 100644 --- a/adminer/dump.inc.php +++ b/adminer/dump.inc.php @@ -23,10 +23,12 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; $create = $connection->result($result, 1); dump(($style == "CREATE+ALTER" ? preg_replace('~^CREATE DATABASE ~', '\\0IF NOT EXISTS ', $create) : $create) . ";\n"); } - if ($style && $_POST["format"] == "sql") { - dump("USE " . idf_escape($db) . ";\n" . ($style == "CREATE+ALTER" ? "SET @adminer_alter = '';\n" : "") . "\n"); + if ($_POST["format"] == "sql") { + if ($style) { + dump("USE " . idf_escape($db) . ";\n" . ($style == "CREATE+ALTER" ? "SET @adminer_alter = '';\n" : "") . "\n"); + } $out = ""; - if ($connection->server_info >= 5) { + if ($_POST["routines"]) { foreach (array("FUNCTION", "PROCEDURE") as $routine) { $result = $connection->query("SHOW $routine STATUS WHERE Db = " . $connection->quote($db)); while ($row = $result->fetch_assoc()) { @@ -35,7 +37,7 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; } } } - if ($connection->server_info >= 5.1) { + if ($_POST["events"]) { $result = $connection->query("SHOW EVENTS"); while ($row = $result->fetch_assoc()) { $out .= ($style != 'DROP+CREATE' ? "DROP EVENT IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "") @@ -145,6 +147,15 @@ echo "" . lang('Output') . "" . lang('Format') . "$dump_format\n"; echo "" . lang('Compression') . "" . ($dump_compress ? $dump_compress : lang('None of the supported PHP extensions (%s) are available.', 'zlib, bz2')) . "\n"; echo "" . lang('Database') . "\n"; +if ($connection->server_info >= 5) { + $objects = array('routines' => lang('Routines')); + if ($connection->server_info >= 5.1) { + $objects['events'] = lang('Events'); + } + foreach ($objects as $key => $val) { + echo " "; + } +} echo "" . lang('Tables') . "\n"; echo "" . lang('Data') . "\n"; ?>