From 5e189f68e2b742e64d1dc9bf8368cb59dc7ba673 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 10 Mar 2011 12:08:25 +0100 Subject: [PATCH] Avoid ;;; Revert "Remove useless rtrim" This reverts commit 3f4ef94f83764b642e19dc579a07ca0999cb6fdb. --- adminer/event.inc.php | 2 +- adminer/procedure.inc.php | 2 +- adminer/trigger.inc.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adminer/event.inc.php b/adminer/event.inc.php index 63248288..2cd7850f 100644 --- a/adminer/event.inc.php +++ b/adminer/event.inc.php @@ -19,7 +19,7 @@ if ($_POST && !$error) { . ($EVENT != $_POST["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($_POST["EVENT_NAME"]) : "") : "CREATE EVENT " . idf_escape($_POST["EVENT_NAME"]) . $schedule ) . "\n" . $statuses[$_POST["STATUS"]] . " COMMENT " . q($_POST["EVENT_COMMENT"]) - . " DO\n$_POST[EVENT_DEFINITION];" + . rtrim(" DO\n$_POST[EVENT_DEFINITION]", ";") . ";" )); } } diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php index 94329d82..198ae6e7 100644 --- a/adminer/procedure.inc.php +++ b/adminer/procedure.inc.php @@ -14,7 +14,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"] } $dropped = drop_create( "DROP $routine " . idf_escape($PROCEDURE), - "CREATE $routine " . idf_escape($_POST["name"]) . " (" . implode(", ", $set) . ")" . (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "") . "\n$_POST[definition];", + "CREATE $routine " . idf_escape($_POST["name"]) . " (" . implode(", ", $set) . ")" . (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "") . rtrim("\n$_POST[definition]", ";") . ";", substr(ME, 0, -1), lang('Routine has been dropped.'), lang('Routine has been altered.'), diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php index aab80246..1ac3930f 100644 --- a/adminer/trigger.inc.php +++ b/adminer/trigger.inc.php @@ -9,7 +9,7 @@ if ($_POST && !$error && in_array($_POST["Timing"], $trigger_options["Timing"]) $on = " ON " . table($TABLE); $dropped = drop_create( "DROP TRIGGER " . idf_escape($_GET["name"]) . ($jush == "pgsql" ? $on : ""), - "CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . ($jush == "mssql" ? $on . $timing_event : $timing_event . $on) . " $_POST[Type]\n$_POST[Statement];", + "CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . ($jush == "mssql" ? $on . $timing_event : $timing_event . $on) . rtrim(" $_POST[Type]\n$_POST[Statement]", ";") . ";", ME . "table=" . urlencode($TABLE), lang('Trigger has been dropped.'), lang('Trigger has been altered.'),