The branch, master has been updated
via fd493c6b4cff296646a9c9ea0d0eda6fbcf9a881 (commit)
via 52ca7974a0fc63aa0f79143e9f19b3eb4b176fc3 (commit)
from 05462eaac750703eb0fb9e0372e647a20eb9529e (commit)
- Log -----------------------------------------------------------------
commit fd493c6b4cff296646a9c9ea0d0eda6fbcf9a881
Author: Rouslan Placella <[email protected]>
Date: Thu Jun 23 14:05:27 2011 +0100
A meaningful error message for when the execution of a routine fails
commit 52ca7974a0fc63aa0f79143e9f19b3eb4b176fc3
Author: Rouslan Placella <[email protected]>
Date: Thu Jun 23 14:04:52 2011 +0100
Improved internationalisation of routines functionality
-----------------------------------------------------------------------
Summary of changes:
db_routines.php | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/db_routines.php b/db_routines.php
index 3307b40..f046648 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -187,7 +187,7 @@ if (! empty($_REQUEST['execute_routine']) && !
empty($_REQUEST['routine_name']))
}
} else {
$output = '';
- $message = PMA_message::error(sprintf(__('Query "%s" failed'),
$query) . '<br /><br />'
+ $message = PMA_message::error(sprintf(__('The following query has
failed: "%s"'), $query) . '<br /><br />'
. __('MySQL said: ') .
PMA_DBI_getError(null));
}
// Print/send output
@@ -206,7 +206,7 @@ if (! empty($_REQUEST['execute_routine']) && !
empty($_REQUEST['routine_name']))
}
} else {
$message = __('Error in processing request') . ' : '
- . sprintf(__('No routine with name %s found in database %s'),
+ . sprintf(__('No routine with name %1$s found in database
%2$s'),
htmlspecialchars(PMA_backquote($_REQUEST['routine_name'])),
htmlspecialchars(PMA_backquote($db)));
$message = PMA_message::error($message);
@@ -237,7 +237,12 @@ if (! empty($_REQUEST['execute_routine']) && !
empty($_REQUEST['routine_name']))
// exit;
}
} else if (($GLOBALS['is_ajax_request'] == true)) {
- PMA_ajaxResponse(PMA_message::error(), false);
+ $message = __('Error in processing request') . ' : '
+ . sprintf(__('No routine with name %1$s found in database
%2$s'),
+
htmlspecialchars(PMA_backquote($_REQUEST['routine_name'])),
+ htmlspecialchars(PMA_backquote($db)));
+ $message = PMA_message::error($message);
+ PMA_ajaxResponse($message, false);
}
} else if (! empty($_GET['exportroutine']) && ! empty($_GET['routine_name'])) {
/**
@@ -261,7 +266,7 @@ if (! empty($_REQUEST['execute_routine']) && !
empty($_REQUEST['routine_name']))
}
} else {
$response = __('Error in processing request') . ' : '
- . sprintf(__('No routine with name %s found in database %s'),
+ . sprintf(__('No routine with name %1$s found in database
%2$s'),
$routine_name,
htmlspecialchars(PMA_backquote($db)));
$response = PMA_message::error($response);
if ($GLOBALS['is_ajax_request']) {
@@ -287,12 +292,12 @@ if (! empty($_REQUEST['execute_routine']) && !
empty($_REQUEST['routine_name']))
$drop_routine = "DROP {$_REQUEST['routine_original_type']} " .
PMA_backquote($_REQUEST['routine_original_name']) . ";\n";
$result = PMA_DBI_try_query($drop_routine);
if (! $result) {
- $routine_errors[] = sprintf(__('Query "%s" failed'),
$drop_routine) . '<br />'
+ $routine_errors[] = sprintf(__('The following query has
failed: "%s"'), $drop_routine) . '<br />'
. __('MySQL said: ') .
PMA_DBI_getError(null);
} else {
$result = PMA_DBI_try_query($routine_query);
if (! $result) {
- $routine_errors[] = sprintf(__('Query "%s" failed'),
$routine_query) . '<br />'
+ $routine_errors[] = sprintf(__('The following query
has failed: "%s"'), $routine_query) . '<br />'
. __('MySQL said: ') .
PMA_DBI_getError(null);
// We dropped the old routine, but were unable to
create the new one
// Try to restore the backup query
@@ -316,7 +321,7 @@ if (! empty($_REQUEST['execute_routine']) && !
empty($_REQUEST['routine_name']))
// 'Add a new routine' mode
$result = PMA_DBI_try_query($routine_query);
if (! $result) {
- $routine_errors[] = sprintf(__('Query "%s" failed'),
$routine_query) . '<br /><br />'
+ $routine_errors[] = sprintf(__('The following query has
failed: "%s"'), $routine_query) . '<br /><br />'
. __('MySQL said: ') .
PMA_DBI_getError(null);
} else {
$message = PMA_Message::success(__('Routine %1$s has been
created.'));
@@ -400,7 +405,7 @@ if (count($routine_errors) || (
empty($_REQUEST['routine_process_addroutine']) &
// exit;
} else {
$message = __('Error in processing request') . ' : '
- . sprintf(__('No routine with name %s found in database %s'),
+ . sprintf(__('No routine with name %1$s found in database
%2$s'),
htmlspecialchars(PMA_backquote($_REQUEST['routine_name'])),
htmlspecialchars(PMA_backquote($db)));
$message = PMA_message::error($message);
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
