Fix - #15205 - Useless backquotes, sql preview, delete index
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
This commit is contained in:
parent
08b4d80758
commit
5d6f761e08
@ -2407,6 +2407,52 @@ function PMA_previewSQL ($form) {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param sql_data Sql query to preview
|
||||
* @param url url to be sent to callback
|
||||
* @param callback callback function
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function PMA_confirmPreviewSQL (sql_data, url, callback) {
|
||||
var $dialog_content = $('<div class="preview_sql"><code class="sql"><pre>'
|
||||
+ sql_data
|
||||
+ '</pre></code></div>'
|
||||
);
|
||||
var button_options = {};
|
||||
var button_options = [
|
||||
{
|
||||
text: PMA_messages.strOK,
|
||||
'class': 'submitOK',
|
||||
click: function () {
|
||||
callback(url);
|
||||
}
|
||||
},
|
||||
{
|
||||
text: PMA_messages.strCancel,
|
||||
'class': 'submitCancel',
|
||||
click: function () {
|
||||
$(this).dialog('close');
|
||||
}
|
||||
}
|
||||
];
|
||||
var $response_dialog = $dialog_content.dialog({
|
||||
minWidth: 550,
|
||||
maxHeight: 400,
|
||||
modal: true,
|
||||
buttons: button_options,
|
||||
title: PMA_messages.strPreviewSQL,
|
||||
close: function () {
|
||||
$(this).remove();
|
||||
},
|
||||
open: function () {
|
||||
// Pretty SQL printing.
|
||||
PMA_highlightSQL($(this));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* check for reserved keyword column name
|
||||
*
|
||||
|
||||
@ -599,7 +599,7 @@ AJAX.registerOnload('indexes.js', function () {
|
||||
.val()
|
||||
);
|
||||
|
||||
$anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
|
||||
PMA_confirmPreviewSQL(question, $anchor.attr('href'), function (url) {
|
||||
var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingPrimaryKeyIndex, false);
|
||||
var params = getJSConfirmCommonParam(this, $anchor.getPostData());
|
||||
$.post(url, params, function (data) {
|
||||
|
||||
@ -751,7 +751,7 @@ class Index
|
||||
. ' DROP PRIMARY KEY;';
|
||||
$this_params['message_to_show']
|
||||
= __('The primary key has been dropped.');
|
||||
$js_msg = Sanitize::jsFormat($this_params['sql_query']);
|
||||
$js_msg = Sanitize::jsFormat($this_params['sql_query'], false);
|
||||
} else {
|
||||
$this_params['sql_query'] = 'ALTER TABLE '
|
||||
. Util::backquote($table) . ' DROP INDEX '
|
||||
|
||||
Loading…
Reference in New Issue
Block a user