Print SQL query by message

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@477 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/create.inc.php b/create.inc.php
index c01ce99d997f2a72e60dfeb01c30b96dd58a88f9..1f2bad68d8b6bb579951a033adc0850c70869826 100644 (file)
--- a/create.inc.php
+++ b/create.inc.php
@@ -5,9 +5,7 @@ if (strlen($_GET["create"])) {
 
 if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"] && !$_POST["down"]) {
        if ($_POST["drop"]) {
-               if ($mysql->query("DROP TABLE " . idf_escape($_GET["create"]))) {
-                       redirect(substr($SELF, 0, -1), lang('Table has been dropped.'));
-               }
+               query_redirect("DROP TABLE " . idf_escape($_GET["create"]), substr($SELF, 0, -1), lang('Table has been dropped.'));
        } else {
                $auto_increment_index = " PRIMARY KEY";
                if (strlen($_GET["create"]) && strlen($_POST["fields"][$_POST["auto_increment_col"]]["orig"])) {
@@ -46,18 +44,13 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
                        . (strlen($_POST["Auto_increment"]) ? " AUTO_INCREMENT=" . intval($_POST["Auto_increment"]) : "")
                        . " COMMENT='" . $mysql->escape_string($_POST["Comment"]) . "'"
                ;
+               $location = $SELF . "table=" . urlencode($_POST["name"]);
                if (strlen($_GET["create"])) {
-                       $query = "ALTER TABLE " . idf_escape($_GET["create"]) . " " . implode(", ", $fields) . ", RENAME TO " . idf_escape($_POST["name"]) . ", $status";
-                       $message = lang('Table has been altered.');
+                       query_redirect("ALTER TABLE " . idf_escape($_GET["create"]) . " " . implode(", ", $fields) . ", RENAME TO " . idf_escape($_POST["name"]) . ", $status", $location, lang('Table has been altered.'));
                } else {
-                       $query = "CREATE TABLE " . idf_escape($_POST["name"]) . " (" . implode(", ", $fields) . ")$status";
-                       $message = lang('Table has been created.');
-               }
-               if ($mysql->query($query)) {
-                       redirect($SELF . "table=" . urlencode($_POST["name"]), $message);
+                       query_redirect("CREATE TABLE " . idf_escape($_POST["name"]) . " (" . implode(", ", $fields) . ")$status", $location, lang('Table has been created.'));
                }
        }
-       $error = $mysql->error;
 }
 page_header((strlen($_GET["create"]) ? lang('Alter table') : lang('Create table')), $error, array("table" => $_GET["create"]), $_GET["create"]);
 

diff --git a/createv.inc.php b/createv.inc.php
index 3281b30feb41e12f9c883e5700fff0f7b1cfd75d..2f284a23936472efc4ff7a39957665653c2c9fbb 100644 (file)
--- a/createv.inc.php
+++ b/createv.inc.php
@@ -7,10 +7,10 @@ if ($_POST && !$error) {
                }
                $dropped = true;
        }
-       if (!$_POST["drop"] && $mysql->query("CREATE VIEW " . idf_escape($_POST["name"]) . " AS " . $_POST["select"])) {
-               redirect($SELF . "view=" . urlencode($_POST["name"]), (strlen($_GET["createv"]) ? lang('View has been altered.') : lang('View has been created.')));
-       }
        $error = $mysql->error;
+       if (!$_POST["drop"]) {
+               query_redirect("CREATE VIEW " . idf_escape($_POST["name"]) . " AS " . $_POST["select"], $SELF . "view=" . urlencode($_POST["name"]), (strlen($_GET["createv"]) ? lang('View has been altered.') : lang('View has been created.')));
+       }
 }
 
 page_header((strlen($_GET["createv"]) ? lang('Alter view') : lang('Create view')), $error, array("view" => $_GET["createv"]), $_GET["createv"]);

diff --git a/database.inc.php b/database.inc.php
index 3ac4eeb6890945a1699996e6adcc86cdf24f70e4..e1519f31c6ad4f214e7cfeb1537a16c79de72cb9 100644 (file)
--- a/database.inc.php
+++ b/database.inc.php
@@ -1,10 +1,8 @@
 <?php
 if ($_POST && !$error) {
        if ($_POST["drop"]) {
-               if ($mysql->query("DROP DATABASE " . idf_escape($_GET["db"]))) {
-                       unset($_SESSION["databases"][$_GET["server"]]);
-                       redirect(substr(preg_replace('~db=[^&]*&~', '', $SELF), 0, -1), lang('Database has been dropped.'));
-               }
+               unset($_SESSION["databases"][$_GET["server"]]);
+               query_redirect("DROP DATABASE " . idf_escape($_GET["db"]), substr(preg_replace('~db=[^&]*&~', '', $SELF), 0, -1), lang('Database has been dropped.'));
        } elseif ($_GET["db"] !== $_POST["name"]) {
                if ($mysql->query("CREATE DATABASE " . idf_escape($_POST["name"]) . ($_POST["collation"] ? " COLLATE '" . $mysql->escape_string($_POST["collation"]) . "'" : ""))) {
                        unset($_SESSION["databases"][$_GET["server"]]);
@@ -23,10 +21,13 @@ if ($_POST && !$error) {
                                redirect(preg_replace('~db=[^&]*&~', '', $SELF) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'));
                        }
                }
-       } elseif (!$_POST["collation"] || $mysql->query("ALTER DATABASE " . idf_escape($_POST["name"]) . " COLLATE '" . $mysql->escape_string($_POST["collation"]) . "'")) {
-               redirect(substr($SELF, 0, -1), ($_POST["collation"] ? lang('Database has been altered.') : null));
+               $error = $mysql->error;
+       } else {
+               if (!$_POST["collation"]) {
+                       redirect(substr($SELF, 0, -1));
+               }
+               query_redirect("ALTER DATABASE " . idf_escape($_POST["name"]) . " COLLATE '" . $mysql->escape_string($_POST["collation"]) . "'", substr($SELF, 0, -1), lang('Database has been altered.'));
        }
-       $error = $mysql->error;
 }
 page_header(strlen($_GET["db"]) ? lang('Alter database') : lang('Create database'), $error, array(), $_GET["db"]);
 

diff --git a/edit.inc.php b/edit.inc.php
index 3ecc2f49ff7b99bc5706f871c083845a6e55090c..3059bb8367c0380033306a89ec561e2fea933b49 100644 (file)
--- a/edit.inc.php
+++ b/edit.inc.php
@@ -7,12 +7,11 @@ foreach ($fields as $name => $field) {
        }
 }
 if ($_POST && !$error) {
-       $set = array();
+       $location = $SELF . (isset($_GET["default"]) ? "table=" : ($_POST["insert"] ? "edit=" : "select=")) . urlencode($_GET["edit"]);
        if (isset($_POST["delete"])) {
-               $set = true;
-               $query = "DELETE FROM " . idf_escape($_GET["edit"]) . " WHERE " . implode(" AND ", $where) . " LIMIT 1";
-               $message = lang('Item has been deleted.');
+               query_redirect("DELETE FROM " . idf_escape($_GET["edit"]) . " WHERE " . implode(" AND ", $where) . " LIMIT 1", $location, lang('Item has been deleted.'));
        } else {
+               $set = array();
                foreach ($fields as $name => $field) {
                        $val = process_input($name, $field);
                        if ($val !== false) {
@@ -25,21 +24,17 @@ if ($_POST && !$error) {
                                }
                        }
                }
+               if (!$set) {
+                       redirect($location);
+               }
                if (isset($_GET["default"])) {
-                       $query = "ALTER TABLE " . idf_escape($_GET["edit"]) . implode(",", $set);
-                       $message = lang('Default values has been set.');
+                       query_redirect("ALTER TABLE " . idf_escape($_GET["edit"]) . implode(",", $set), $location, lang('Default values has been set.'));
                } elseif ($where) {
-                       $query = "UPDATE " . idf_escape($_GET["edit"]) . " SET " . implode(", ", $set) . " WHERE " . implode(" AND ", $where) . " LIMIT 1";
-                       $message = lang('Item has been updated.');
+                       query_redirect("UPDATE " . idf_escape($_GET["edit"]) . " SET " . implode(", ", $set) . " WHERE " . implode(" AND ", $where) . " LIMIT 1", $location, lang('Item has been updated.'));
                } else {
-                       $query = "INSERT INTO " . idf_escape($_GET["edit"]) . " SET " . implode(", ", $set);
-                       $message = lang('Item has been inserted.');
+                       query_redirect("INSERT INTO " . idf_escape($_GET["edit"]) . " SET " . implode(", ", $set), $location, lang('Item has been inserted.'));
                }
        }
-       if (!$set || $mysql->query($query)) {
-               redirect($SELF . (isset($_GET["default"]) ? "table=" : ($_POST["insert"] ? "edit=" : "select=")) . urlencode($_GET["edit"]), ($set ? $message : null));
-       }
-       $error = $mysql->error;
 }
 page_header((isset($_GET["default"]) ? lang('Default values') : ($_GET["where"] ? lang('Edit') : lang('Insert'))), $error, array((isset($_GET["default"]) ? "table" : "select") => $_GET["edit"]), $_GET["edit"]);
 

diff --git a/event.inc.php b/event.inc.php
index 9a0dba7fc70cb7ff350823ccf6eb8252c5aa1187..b2fb7b871af55069983a93c6071dfa5a32698eed 100644 (file)
--- a/event.inc.php
+++ b/event.inc.php
@@ -3,16 +3,11 @@ $intervals = array("YEAR", "QUARTER", "MONTH", "DAY", "HOUR", "MINUTE", "WEEK",
 
 if ($_POST && !$error) {
        if ($_POST["drop"]) {
-               if ($mysql->query("DROP EVENT " . idf_escape($_GET["event"]))) {
-                       redirect(substr($SELF, 0, -1), lang('Event has been dropped.'));
-               }
+               query_redirect("DROP EVENT " . idf_escape($_GET["event"]), substr($SELF, 0, -1), lang('Event has been dropped.'));
        } elseif (in_array($_POST["INTERVAL_FIELD"], $intervals)) {
                $schedule = " ON SCHEDULE " . ($_POST["INTERVAL_VALUE"] ? "EVERY '" . $mysql->escape_string($_POST["INTERVAL_VALUE"]) . "' $_POST[INTERVAL_FIELD]" . ($_POST["STARTS"] ? " STARTS '" . $mysql->escape_string($_POST["STARTS"]) . "'" : "") . ($_POST["ENDS"] ? " ENDS '" . $mysql->escape_string($_POST["ENDS"]) . "'" : "") : "AT '" . $mysql->escape_string($_POST["STARTS"]) . "'");
-               if ($mysql->query((strlen($_GET["event"]) ? "ALTER EVENT " . idf_escape($_GET["event"]) . $schedule . ($_GET["event"] != $_POST["EVENT_NAME"] ? " RENAME TO " . idf_escape($_POST["EVENT_NAME"]) : "") : "CREATE EVENT " . idf_escape($_POST["EVENT_NAME"]) . $schedule) . " DO $_POST[EVENT_DEFINITION]")) {
-                       redirect(substr($SELF, 0, -1), (strlen($_GET["event"]) ? lang('Event has been altered.') : lang('Event has been created.')));
-               }
+               query_redirect((strlen($_GET["event"]) ? "ALTER EVENT " . idf_escape($_GET["event"]) . $schedule . ($_GET["event"] != $_POST["EVENT_NAME"] ? " RENAME TO " . idf_escape($_POST["EVENT_NAME"]) : "") : "CREATE EVENT " . idf_escape($_POST["EVENT_NAME"]) . $schedule) . " DO $_POST[EVENT_DEFINITION]", substr($SELF, 0, -1), (strlen($_GET["event"]) ? lang('Event has been altered.') : lang('Event has been created.')));
        }
-       $error = $mysql->error;
 }
 page_header((strlen($_GET["event"]) ? lang('Alter event') . ": " . htmlspecialchars($_GET["event"]) : lang('Create event')), $error);
 

diff --git a/foreign.inc.php b/foreign.inc.php
index 65e54a06820956d9048aaa5df3aeaa61c1a273ae..2904bc14c529a7fb7a587e816ed31113bfa44848 100644 (file)
--- a/foreign.inc.php
+++ b/foreign.inc.php
@@ -1,9 +1,7 @@
 <?php
 if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-js"]) {
        if ($_POST["drop"]) {
-               if ($mysql->query("ALTER TABLE " . idf_escape($_GET["foreign"]) . " DROP FOREIGN KEY " . idf_escape($_GET["name"]))) {
-                       redirect($SELF . "table=" . urlencode($_GET["foreign"]), lang('Foreign key has been dropped.'));
-               }
+               query_redirect("ALTER TABLE " . idf_escape($_GET["foreign"]) . " DROP FOREIGN KEY " . idf_escape($_GET["name"]), $SELF . "table=" . urlencode($_GET["foreign"]), lang('Foreign key has been dropped.'));
        } else {
                $source = array_filter($_POST["source"], 'strlen');
                ksort($source);
@@ -11,18 +9,13 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-
                foreach ($source as $key => $val) {
                        $target[$key] = $_POST["target"][$key];
                }
-               if ($mysql->query("
-                       ALTER TABLE " . idf_escape($_GET["foreign"])
-                       . (strlen($_GET["name"]) ? " DROP FOREIGN KEY " . idf_escape($_GET["name"]) . "," : "") . "
-                       ADD FOREIGN KEY (" . implode(", ", array_map('idf_escape', $source)) . ")
-                       REFERENCES " . idf_escape($_POST["table"]) . " (" . implode(", ", array_map('idf_escape', $target)) . ")"
+               query_redirect("ALTER TABLE " . idf_escape($_GET["foreign"])
+                       . (strlen($_GET["name"]) ? " DROP FOREIGN KEY " . idf_escape($_GET["name"]) . "," : "")
+                       . " ADD FOREIGN KEY (" . implode(", ", array_map('idf_escape', $source)) . ") REFERENCES " . idf_escape($_POST["table"]) . " (" . implode(", ", array_map('idf_escape', $target)) . ")"
                        . (in_array($_POST["on_delete"], $on_actions) ? " ON DELETE $_POST[on_delete]" : "")
                        . (in_array($_POST["on_update"], $on_actions) ? " ON UPDATE $_POST[on_update]" : "")
-               )) {
-                       redirect($SELF . "table=" . urlencode($_GET["foreign"]), (strlen($_GET["name"]) ? lang('Foreign key has been altered.') : lang('Foreign key has been created.')));
-               }
+               , $SELF . "table=" . urlencode($_GET["foreign"]), (strlen($_GET["name"]) ? lang('Foreign key has been altered.') : lang('Foreign key has been created.')));
        }
-       $error = $mysql->error;
 }
 page_header(lang('Foreign key'), $error, array("table" => $_GET["foreign"]), $_GET["foreign"]);
 

diff --git a/functions.inc.php b/functions.inc.php
index 506cc1038cab520df2c8fc40cc6bf5616ca91410..76ea8eee6b7ea11e2919ea9dc23960c5564a5f33 100644 (file)
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -195,6 +195,14 @@ function redirect($location, $message = null) {
        exit;
 }
 
+function query_redirect($query, $location, $message) {
+       global $mysql, $error, $SELF;
+       if ($mysql->query($query)) {
+               redirect($location, $message . "<br /><code class='jush-sql'>" . htmlspecialchars($query) . '</code> - <a href="' . htmlspecialchars($SELF) . 'sql=' . urlencode($query) . '">' . lang('edit') . '</a>');
+       }
+       $error = $mysql->error;
+}
+
 function remove_from_uri($param = "") {
        $param = "($param|" . session_name() . ")";
        return preg_replace("~\\?$param=[^&]*&~", '?', preg_replace("~\\?$param=[^&]*\$|&$param=[^&]*~", '', $_SERVER["REQUEST_URI"]));

diff --git a/indexes.inc.php b/indexes.inc.php
index 68b3c810f2f273f61f69065ff1d038cbb4cd0eca..47952c68a2a58fd1bd9a268baf0bd5e400dd2789 100644 (file)
--- a/indexes.inc.php
+++ b/indexes.inc.php
@@ -33,10 +33,10 @@ if ($_POST && !$error && !$_POST["add"]) {
        foreach ($indexes as $name => $existing) {
                $alter[] = "DROP INDEX " . idf_escape($name);
        }
-       if (!$alter || $mysql->query("ALTER TABLE " . idf_escape($_GET["indexes"]) . " " . implode(", ", $alter))) {
-               redirect($SELF . "table=" . urlencode($_GET["indexes"]), ($alter ? lang('Indexes has been altered.') : null));
+       if (!$alter) {
+               redirect($SELF . "table=" . urlencode($_GET["indexes"]));
        }
-       $error = $mysql->error;
+       query_redirect("ALTER TABLE " . idf_escape($_GET["indexes"]) . " " . implode(", ", $alter), $SELF . "table=" . urlencode($_GET["indexes"]), lang('Indexes has been altered.'));
 }
 page_header(lang('Indexes'), $error, array("table" => $_GET["indexes"]), $_GET["indexes"]);
 

diff --git a/procedure.inc.php b/procedure.inc.php
index 36f42e0498518c400d749fa5c4938176b63bfb2f..25724be4e70d9fea20c8d834a81ecbf2984f204e 100644 (file)
--- a/procedure.inc.php
+++ b/procedure.inc.php
@@ -9,6 +9,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
                }
                $dropped = true;
        }
+       $error = $mysql->error;
        if (!$_POST["drop"]) {
                $set = array();
                $fields = array_filter((array) $_POST["fields"], 'strlen');
@@ -18,16 +19,12 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
                                $set[] = (in_array($field["inout"], $inout) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
                        }
                }
-               if ($mysql->query(
-                       "CREATE $routine " . idf_escape($_POST["name"])
+               query_redirect("CREATE $routine " . idf_escape($_POST["name"])
                        . " (" . implode(", ", $set) . ")"
-                       . (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "") . "
-                       $_POST[definition]"
-               )) {
-                       redirect(substr($SELF, 0, -1), (strlen($_GET["procedure"]) ? lang('Routine has been altered.') : lang('Routine has been created.')));
-               }
+                       . (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "")
+                       . " $_POST[definition]"
+               , substr($SELF, 0, -1), (strlen($_GET["procedure"]) ? lang('Routine has been altered.') : lang('Routine has been created.')));
        }
-       $error = $mysql->error;
 }
 page_header((strlen($_GET["procedure"]) ? (isset($_GET["function"]) ? lang('Alter function') : lang('Alter procedure')) . ": " . htmlspecialchars($_GET["procedure"]) : (isset($_GET["function"]) ? lang('Create function') : lang('Create procedure'))), $error);
 

diff --git a/todo.txt b/todo.txt
index ef9736704329fac5c0529f9b91f166488c31df3f..673666837a5b9eceb8bea07d70d71f491cb2e43b 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -11,5 +11,6 @@ Transactions in export
 Compress export and import
 Partitioning (MySQL 5.1)
 Create view options
+Utilize query_redirect - createv, database, procedure, trigger, select
 ? Execution time in sql.inc.php
 ? Save token also to cookie - for session expiration and login in other window

diff --git a/trigger.inc.php b/trigger.inc.php
index d4034087fc8fef254b52d9dd55427627e14f4066..7b742303d067dfb055ca798b8ca90a627c11d333 100644 (file)
--- a/trigger.inc.php
+++ b/trigger.inc.php
@@ -10,14 +10,12 @@ if ($_POST && !$error) {
                }
                $dropped = true;
        }
+       $error = $mysql->error;
        if (!$_POST["drop"]) {
-               if (in_array($_POST["Timing"], $trigger_time) && in_array($_POST["Event"], $trigger_event) && $mysql->query(
-                       "CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . " $_POST[Timing] $_POST[Event] ON " . idf_escape($_GET["trigger"]) . " FOR EACH ROW $_POST[Statement]"
-               )) {
-                       redirect($SELF . "table=" . urlencode($_GET["trigger"]), (strlen($_GET["name"]) ? lang('Trigger has been altered.') : lang('Trigger has been created.')));
+               if (in_array($_POST["Timing"], $trigger_time) && in_array($_POST["Event"], $trigger_event)) {
+                       query_redirect("CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . " $_POST[Timing] $_POST[Event] ON " . idf_escape($_GET["trigger"]) . " FOR EACH ROW $_POST[Statement]", $SELF . "table=" . urlencode($_GET["trigger"]), (strlen($_GET["name"]) ? lang('Trigger has been altered.') : lang('Trigger has been created.')));
                }
        }
-       $error = $mysql->error;
 }
 page_header((strlen($_GET["name"]) ? lang('Alter trigger') . ": " . htmlspecialchars($_GET["name"]) : lang('Create trigger')), $error, array("table" => $_GET["trigger"]));
 

diff --git a/user.inc.php b/user.inc.php
index e92b8ea081d5b0ee0e437b6340a5256bca79554a..10f56a5047ee8f96177eb6eb81234ce2bc94c059 100644 (file)
--- a/user.inc.php
+++ b/user.inc.php
@@ -68,9 +68,7 @@ if ($_POST && !$error) {
        $new_user = $mysql->escape_string($_POST["user"]) . "'@'" . $mysql->escape_string($_POST["host"]);
        $pass = $mysql->escape_string($_POST["pass"]);
        if ($_POST["drop"]) {
-               if ($mysql->query("DROP USER '$old_user'")) {
-                       redirect($SELF . "privileges=", lang('User has been dropped.'));
-               }
+               query_redirect("DROP USER '$old_user'", $SELF . "privileges=", lang('User has been dropped.'));
        } elseif ($old_user == $new_user || $mysql->query(($mysql->server_info < 5 ? "GRANT USAGE ON *.* TO" : "CREATE USER") . " '$new_user' IDENTIFIED BY" . ($_POST["hashed"] ? " PASSWORD" : "") . " '$pass'")) {
                if ($old_user == $new_user) {
                        $mysql->query("SET PASSWORD FOR '$new_user' = " . ($_POST["hashed"] ? "'$pass'" : "PASSWORD('$pass')"));