IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed code smell 'Variables should not be shadowed'.

Browse Source
This commit is contained in:
Yogesh Mahajan
2020-07-09 18:44:58 +05:30
committed by Akshay Joshi
parent e1168f8de0
commit 2cefa9afca
3 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
web/pgadmin/tools/debugger/static/js/debugger_ui.js
View File

@@ -163,7 +163,7 @@ define([
} }
}; };
var res = function(debug_info, restart_debug, is_edb_proc, trans_id) { var res = function(debugInfo, restartDebug, isEdbProc, transId) {
if (!Alertify.debuggerInputArgsDialog) { if (!Alertify.debuggerInputArgsDialog) {
Alertify.dialog('debuggerInputArgsDialog', function factory() { Alertify.dialog('debuggerInputArgsDialog', function factory() {
return { return {
@@ -242,16 +242,16 @@ define([
method: 'GET', method: 'GET',
async: false, async: false,
}) })
.done(function(res) { .done(function(res_get) {
if (res.data.args_count != 0) { if (res_get.data.args_count != 0) {
for (i = 0; i < res.data.result.length; i++) { for (i = 0; i < res_get.data.result.length; i++) {
// Below will format the data to be stored in sqlite database // Below will format the data to be stored in sqlite database
func_args_data.push({ func_args_data.push({
'arg_id': res.data.result[i]['arg_id'], 'arg_id': res_get.data.result[i]['arg_id'],
'is_null': res.data.result[i]['is_null'], 'is_null': res_get.data.result[i]['is_null'],
'is_expression': res.data.result[i]['is_expression'], 'is_expression': res_get.data.result[i]['is_expression'],
'use_default': res.data.result[i]['use_default'], 'use_default': res_get.data.result[i]['use_default'],
'value': res.data.result[i]['value'], 'value': res_get.data.result[i]['value'],
}); });
} }
} }
@@ -751,11 +751,11 @@ define([
'data': JSON.stringify(args_value_list), 'data': JSON.stringify(args_value_list),
}, },
}) })
.done(function(res) { .done(function(res_post) {
var url = url_for( var url = url_for(
'debugger.direct', { 'debugger.direct', {
'trans_id': res.data.debuggerTransId, 'trans_id': res_post.data.debuggerTransId,
} }
); );
@@ -779,7 +779,7 @@ define([
// Panel Closed event // Panel Closed event
panel.on(wcDocker.EVENT.CLOSED, function() { panel.on(wcDocker.EVENT.CLOSED, function() {
var closeUrl = url_for('debugger.close', { var closeUrl = url_for('debugger.close', {
'trans_id': res.data.debuggerTransId, 'trans_id': res_post.data.debuggerTransId,
}); });
$.ajax({ $.ajax({
url: closeUrl, url: closeUrl,
@@ -787,17 +787,17 @@ define([
}); });
}); });
} }
var _Url; var _url;
if (d._type == 'function') { if (d._type == 'function') {
_Url = url_for('debugger.set_arguments', { _url = url_for('debugger.set_arguments', {
'sid': treeInfo.server._id, 'sid': treeInfo.server._id,
'did': treeInfo.database._id, 'did': treeInfo.database._id,
'scid': treeInfo.schema._id, 'scid': treeInfo.schema._id,
'func_id': treeInfo.function._id, 'func_id': treeInfo.function._id,
}); });
} else if (d._type == 'procedure') { } else if (d._type == 'procedure') {
_Url = url_for('debugger.set_arguments', { _url = url_for('debugger.set_arguments', {
'sid': treeInfo.server._id, 'sid': treeInfo.server._id,
'did': treeInfo.database._id, 'did': treeInfo.database._id,
'scid': treeInfo.schema._id, 'scid': treeInfo.schema._id,
@@ -805,7 +805,7 @@ define([
}); });
} else if (d._type == 'edbfunc') { } else if (d._type == 'edbfunc') {
// Get the existing function parameters available from sqlite database // Get the existing function parameters available from sqlite database
_Url = url_for('debugger.set_arguments', { _url = url_for('debugger.set_arguments', {
'sid': treeInfo.server._id, 'sid': treeInfo.server._id,
'did': treeInfo.database._id, 'did': treeInfo.database._id,
'scid': treeInfo.schema._id, 'scid': treeInfo.schema._id,
@@ -813,7 +813,7 @@ define([
}); });
} else if (d._type == 'edbproc') { } else if (d._type == 'edbproc') {
// Get the existing function parameters available from sqlite database // Get the existing function parameters available from sqlite database
_Url = url_for('debugger.set_arguments', { _url = url_for('debugger.set_arguments', {
'sid': treeInfo.server._id, 'sid': treeInfo.server._id,
'did': treeInfo.database._id, 'did': treeInfo.database._id,
'scid': treeInfo.schema._id, 'scid': treeInfo.schema._id,
@@ -822,7 +822,7 @@ define([
} }
$.ajax({ $.ajax({
url: _Url, url: _url,
method: 'POST', method: 'POST',
data: { data: {
'data': JSON.stringify(sqlite_func_args_list), 'data': JSON.stringify(sqlite_func_args_list),
@@ -836,10 +836,10 @@ define([
); );
}); });
}) })
.fail(function(e) { .fail(function(er) {
Alertify.alert( Alertify.alert(
gettext('Debugger Target Initialization Error'), gettext('Debugger Target Initialization Error'),
e.responseJSON.errormsg er.responseJSON.errormsg
); );
}); });
} else { } else {
@@ -857,10 +857,10 @@ define([
}, },
}) })
.done(function() {}) .done(function() {})
.fail(function(e) { .fail(function(er) {
Alertify.alert( Alertify.alert(
gettext('Debugger Listener Startup Error'), gettext('Debugger Listener Startup Error'),
e.responseJSON.errormsg er.responseJSON.errormsg
); );
}); });
@@ -902,50 +902,50 @@ define([
} }
if (e.button.text === gettext('Clear All')) { if (e.button.text === gettext('Clear All')) {
let self = this; let _self = this;
let baseUrl = null; let base_url = null;
if (self.setting('restart_debug') == 0) { if (_self.setting('restart_debug') == 0) {
let selected_item = pgBrowser.tree.selected(); let selected_item = pgBrowser.tree.selected();
let item_data = pgBrowser.tree.itemData(selected_item); let item_data = pgBrowser.tree.itemData(selected_item);
if (!item_data) if (!item_data)
return; return;
let node = pgBrowser.Nodes[item_data._type]; let node_ele = pgBrowser.Nodes[item_data._type];
let treeInfo = node.getTreeNodeHierarchy.call(node, selected_item); let tree_info = node_ele.getTreeNodeHierarchy.call(node_ele, selected_item);
baseUrl = url_for('debugger.clear_arguments', { base_url = url_for('debugger.clear_arguments', {
'sid': treeInfo.server._id, 'sid': tree_info.server._id,
'did': treeInfo.database._id, 'did': tree_info.database._id,
'scid': treeInfo.schema._id, 'scid': tree_info.schema._id,
'func_id': item_data._id, 'func_id': item_data._id,
}); });
} else { } else {
baseUrl = url_for('debugger.clear_arguments', { base_url = url_for('debugger.clear_arguments', {
'sid': self.setting('debug_info').server_id, 'sid': _self.setting('debug_info').server_id,
'did': self.setting('debug_info').database_id, 'did': _self.setting('debug_info').database_id,
'scid': self.setting('debug_info').schema_id, 'scid': _self.setting('debug_info').schema_id,
'func_id': self.setting('debug_info').function_id, 'func_id': _self.setting('debug_info').function_id,
}); });
} }
$.ajax({ $.ajax({
url: baseUrl, url: base_url,
method: 'POST', method: 'POST',
data: { data: {
'data': JSON.stringify(args_value_list), 'data': JSON.stringify(args_value_list),
}, },
}).done(function() { }).done(function() {
/* Disable debug button */ /* Disable debug button */
self.__internal.buttons[2].element.disabled = true; _self.__internal.buttons[2].element.disabled = true;
self.main(self.setting('title'), self.setting('debug_info'), _self.main(_self.setting('title'), _self.setting('debug_info'),
self.setting('restart_debug'), self.setting('is_edb_proc'), _self.setting('restart_debug'), _self.setting('is_edb_proc'),
self.setting('trans_id') _self.setting('trans_id')
); );
self.prepare(); _self.prepare();
}).fail(function(e) { }).fail(function(er) {
Alertify.alert( Alertify.alert(
gettext('Clear failed'), gettext('Clear failed'),
e.responseJSON.errormsg er.responseJSON.errormsg
); );
}); });
@@ -1023,7 +1023,7 @@ define([
} }
Alertify.debuggerInputArgsDialog( Alertify.debuggerInputArgsDialog(
gettext('Debugger'), debug_info, restart_debug, is_edb_proc, trans_id gettext('Debugger'), debugInfo, restartDebug, isEdbProc, transId
).resizeTo(pgBrowser.stdW.md,pgBrowser.stdH.md); ).resizeTo(pgBrowser.stdW.md,pgBrowser.stdH.md);
}; };

14
web/pgadmin/tools/debugger/static/js/direct.js
View File

@@ -684,12 +684,12 @@ define([
} else { } else {
// Debugging of void function is started again so we need to start // Debugging of void function is started again so we need to start
// the listener again // the listener again
var baseUrl = url_for('debugger.start_listener', { var base_url = url_for('debugger.start_listener', {
'trans_id': trans_id, 'trans_id': trans_id,
}); });
$.ajax({ $.ajax({
url: baseUrl, url: base_url,
method: 'GET', method: 'GET',
}) })
.done(function() { .done(function() {
@@ -894,9 +894,9 @@ define([
.done(function(res) { .done(function(res) {
if (res.data.status) { if (res.data.status) {
// Call function to create and update local variables .... // Call function to create and update local variables ....
var info = pgTools.DirectDebug.editor.lineInfo(self.active_line_no); var info_local = pgTools.DirectDebug.editor.lineInfo(self.active_line_no);
if (info.gutterMarkers != undefined) { if (info_local.gutterMarkers != undefined) {
pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', null); pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', null);
} else { } else {
pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', function() { pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', function() {
@@ -955,12 +955,12 @@ define([
}) })
.done(function(res) { .done(function(res) {
if (res.data.status) { if (res.data.status) {
for (var i = 0; i < breakpoint_list.length; i++) { for (var j = 0; j < breakpoint_list.length; j++) {
var info = pgTools.DirectDebug.editor.lineInfo((breakpoint_list[i] - 1)); var info = pgTools.DirectDebug.editor.lineInfo((breakpoint_list[j] - 1));
if (info) { if (info) {
if (info.gutterMarkers != undefined) { if (info.gutterMarkers != undefined) {
pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[i] - 1), 'breakpoints', null); pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[j] - 1), 'breakpoints', null);
} }
} }
} }

160
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@@ -500,12 +500,12 @@ define('tools.querytool', [
* Render function for hint to add our own class * Render function for hint to add our own class
* and icon as per the object type. * and icon as per the object type.
*/ */
hint_render: function(elt, data, cur) { hint_render: function(elt, data_arg, cur_arg) {
var el = document.createElement('span'); var el = document.createElement('span');
switch (cur.type) { switch (cur_arg.type) {
case 'database': case 'database':
el.className = 'sqleditor-hint pg-icon-' + cur.type; el.className = 'sqleditor-hint pg-icon-' + cur_arg.type;
break; break;
case 'datatype': case 'datatype':
el.className = 'sqleditor-hint icon-type'; el.className = 'sqleditor-hint icon-type';
@@ -517,10 +517,10 @@ define('tools.querytool', [
el.className = 'fa fa-at'; el.className = 'fa fa-at';
break; break;
default: default:
el.className = 'sqleditor-hint icon-' + cur.type; el.className = 'sqleditor-hint icon-' + cur_arg.type;
} }
el.appendChild(document.createTextNode(cur.text)); el.appendChild(document.createTextNode(cur_arg.text));
elt.appendChild(el); elt.appendChild(el);
}, },
}; };
@@ -539,13 +539,13 @@ define('tools.querytool', [
return { return {
then: function(cb) { then: function(cb) {
var self = this; var self_local = this;
// Make ajax call to find the autocomplete data // Make ajax call to find the autocomplete data
$.ajax({ $.ajax({
url: self.url, url: self_local.url,
method: 'POST', method: 'POST',
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify(self.data), data: JSON.stringify(self_local.data),
}) })
.done(function(res) { .done(function(res) {
var result = []; var result = [];
@@ -554,7 +554,7 @@ define('tools.querytool', [
result.push({ result.push({
text: key, text: key,
type: obj.object_type, type: obj.object_type,
render: self.hint_render, render: self_local.hint_render,
}); });
}); });
@@ -573,7 +573,7 @@ define('tools.querytool', [
* Below logic find the start and end point * Below logic find the start and end point
* to replace the selected auto complete suggestion. * to replace the selected auto complete suggestion.
*/ */
var token = self.editor.getTokenAt(cur), var token = self_local.editor.getTokenAt(cur),
start, end, search; start, end, search;
if (token.end > cur.ch) { if (token.end > cur.ch) {
token.end = cur.ch; token.end = cur.ch;
@@ -600,18 +600,18 @@ define('tools.querytool', [
cb({ cb({
list: result, list: result,
from: { from: {
line: self.current_line, line: self_local.current_line,
ch: start, ch: start,
}, },
to: { to: {
line: self.current_line, line: self_local.current_line,
ch: end, ch: end,
}, },
}); });
}) })
.fail(function(e) { .fail(function(e) {
return httpErrorHandler.handleLoginRequiredAndTransactionRequired( return httpErrorHandler.handleLoginRequiredAndTransactionRequired(
pgAdmin, self, e, null, [], false pgAdmin, self_local, e, null, [], false
); );
}); });
}.bind(ctx), }.bind(ctx),
@@ -896,20 +896,20 @@ define('tools.querytool', [
// Add-on function which allow us to identify the faulty row after insert/update // Add-on function which allow us to identify the faulty row after insert/update
// and apply css accordingly // and apply css accordingly
dataView.getItemMetadata = function(i) { dataView.getItemMetadata = function(rows) {
var cssClass = '', var cssClass = '',
data_store = self.handler.data_store; data_store = self.handler.data_store;
if (_.has(self.handler, 'data_store')) { if (_.has(self.handler, 'data_store')) {
if (i in data_store.added_index && if (rows in data_store.added_index &&
data_store.added_index[i] in data_store.added) { data_store.added_index[rows] in data_store.added) {
cssClass = 'new_row'; cssClass = 'new_row';
if (data_store.added[data_store.added_index[i]].err) { if (data_store.added[data_store.added_index[rows]].err) {
cssClass += ' error'; cssClass += ' error';
} }
} else if (i in data_store.updated_index && i in data_store.updated) { } else if (rows in data_store.updated_index && rows in data_store.updated) {
cssClass = 'updated_row'; cssClass = 'updated_row';
if (data_store.updated[data_store.updated_index[i]].err) { if (data_store.updated[data_store.updated_index[rows]].err) {
cssClass += ' error'; cssClass += ' error';
} }
} }
@@ -918,7 +918,7 @@ define('tools.querytool', [
// Disable rows having default values // Disable rows having default values
if (!_.isUndefined(self.handler.rows_to_disable) && if (!_.isUndefined(self.handler.rows_to_disable) &&
self.handler.rows_to_disable.length > 0 && self.handler.rows_to_disable.length > 0 &&
_.indexOf(self.handler.rows_to_disable, i) !== -1) { _.indexOf(self.handler.rows_to_disable, rows) !== -1) {
cssClass += ' disabled_row'; cssClass += ' disabled_row';
} }
@@ -938,8 +938,8 @@ define('tools.querytool', [
headerButtonsPlugin.onCommand.subscribe(function (e, args) { headerButtonsPlugin.onCommand.subscribe(function (e, args) {
let command = args.command; let command = args.command;
if (command === 'view-geometries') { if (command === 'view-geometries') {
let columns = args.grid.getColumns(); let cols = args.grid.getColumns();
let columnIndex = columns.indexOf(args.column); let columnIndex = cols.indexOf(args.column);
let selectedRows = args.grid.getSelectedRows(); let selectedRows = args.grid.getSelectedRows();
if (selectedRows.length === 0) { if (selectedRows.length === 0) {
// if no rows are selected, load and render all the rows // if no rows are selected, load and render all the rows
@@ -948,12 +948,12 @@ define('tools.querytool', [
// trigger onGridSelectAll manually with new event data. // trigger onGridSelectAll manually with new event data.
gridSelector.onGridSelectAll.notify(args, new Slick.EventData()); gridSelector.onGridSelectAll.notify(args, new Slick.EventData());
let items = args.grid.getData().getItems(); let items = args.grid.getData().getItems();
GeometryViewer.render_geometries(self.handler, items, columns, columnIndex); GeometryViewer.render_geometries(self.handler, items, cols, columnIndex);
}); });
} else { } else {
gridSelector.onGridSelectAll.notify(args, new Slick.EventData()); gridSelector.onGridSelectAll.notify(args, new Slick.EventData());
let items = args.grid.getData().getItems(); let items = args.grid.getData().getItems();
GeometryViewer.render_geometries(self.handler, items, columns, columnIndex); GeometryViewer.render_geometries(self.handler, items, cols, columnIndex);
} }
} else { } else {
// render selected rows // render selected rows
@@ -961,7 +961,7 @@ define('tools.querytool', [
let selectedItems = _.map(selectedRows, function (row) { let selectedItems = _.map(selectedRows, function (row) {
return items[row]; return items[row];
}); });
GeometryViewer.render_geometries(self.handler, selectedItems, columns, columnIndex); GeometryViewer.render_geometries(self.handler, selectedItems, cols, columnIndex);
} }
} }
}); });
@@ -992,10 +992,10 @@ define('tools.querytool', [
} }
grid.onColumnsResized.subscribe(function() { grid.onColumnsResized.subscribe(function() {
var columns = this.getColumns(); var cols = this.getColumns();
_.each(columns, function(col) { _.each(cols, function(col) {
var column_size = self.handler['col_size']; var col_size = self.handler['col_size'];
column_size[self.handler['table_name']][col['id']] = col['width']; col_size[self.handler['table_name']][col['id']] = col['width'];
}); });
}.bind(grid)); }.bind(grid));
@@ -1106,8 +1106,8 @@ define('tools.querytool', [
// The purpose is to remove row_id from temp_new_row // The purpose is to remove row_id from temp_new_row
// if new row has primary key instead of [default_value] // if new row has primary key instead of [default_value]
// so that cell edit is enabled for that row. // so that cell edit is enabled for that row.
var grid = args.grid, var grid_edit = args.grid,
row_data = grid.getDataItem(args.row), row_data = grid_edit.getDataItem(args.row),
is_primary_key = self.primary_keys && is_primary_key = self.primary_keys &&
_.all( _.all(
_.values( _.values(
@@ -1164,25 +1164,25 @@ define('tools.querytool', [
grid.onAddNewRow.subscribe(function(e, args) { grid.onAddNewRow.subscribe(function(e, args) {
// self.handler.data_store.added will holds all the newly added rows/data // self.handler.data_store.added will holds all the newly added rows/data
var column = args.column, var column = args.column,
item = args.item, item_current = args.item,
data_length = this.grid.getDataLength(), data_length = this.grid.getDataLength(),
_key = (self.client_primary_key_counter++).toString(), _key = (self.client_primary_key_counter++).toString(),
dataView = this.grid.getData(); data_view = this.grid.getData();
// Add new row in list to keep track of it // Add new row in list to keep track of it
if (_.isUndefined(item[0])) { if (_.isUndefined(item_current[0])) {
self.handler.temp_new_rows.push(data_length); self.handler.temp_new_rows.push(data_length);
} }
// If copied item has already primary key, use it. // If copied item has already primary key, use it.
if (item) { if (item_current) {
item[self.client_primary_key] = _key; item_current[self.client_primary_key] = _key;
} }
dataView.addItem(item); data_view.addItem(item_current);
self.handler.data_store.added[_key] = { self.handler.data_store.added[_key] = {
'err': false, 'err': false,
'data': item, 'data': item_current,
}; };
self.handler.data_store.added_index[data_length] = _key; self.handler.data_store.added_index[data_length] = _key;
@@ -1195,7 +1195,7 @@ define('tools.querytool', [
grid.render(); grid.render();
// Highlight the first added cell of the new row // Highlight the first added cell of the new row
var row = dataView.getRowByItem(item); var row = data_view.getRowByItem(item_current);
self.handler.numberOfModifiedCells++; self.handler.numberOfModifiedCells++;
args.grid.addCellCssStyles(self.handler.numberOfModifiedCells, { args.grid.addCellCssStyles(self.handler.numberOfModifiedCells, {
[row] : { [row] : {
@@ -2615,25 +2615,25 @@ define('tools.querytool', [
self._fetch_column_metadata.call( self._fetch_column_metadata.call(
self, data, self, data,
function() { function() {
var self = this; var self_col = this;
self.trigger( self_col.trigger(
'pgadmin-sqleditor:loading-icon:message', 'pgadmin-sqleditor:loading-icon:message',
gettext('Loading data from the database server and rendering...'), gettext('Loading data from the database server and rendering...'),
self self_col
); );
// Show message in message and history tab in case of query tool // Show message in message and history tab in case of query tool
self.total_time = calculateQueryRunTime.calculateQueryRunTime( self_col.total_time = calculateQueryRunTime.calculateQueryRunTime(
self.query_start_time, self_col.query_start_time,
self.query_end_time self_col.query_end_time
); );
var msg1 = gettext('Successfully run. Total query runtime: %s.',self.total_time); var msg1 = gettext('Successfully run. Total query runtime: %s.',self_col.total_time);
var msg2 = gettext('%s rows affected.',self.rows_affected); var msg2 = gettext('%s rows affected.',self_col.rows_affected);
// Display the notifier if the timeout is set to >= 0 // Display the notifier if the timeout is set to >= 0
if (self.info_notifier_timeout >= 0) { if (self_col.info_notifier_timeout >= 0) {
alertify.success(msg1 + ' ' + msg2, self.info_notifier_timeout); alertify.success(msg1 + ' ' + msg2, self_col.info_notifier_timeout);
} }
var _msg = msg1 + '\n' + msg2; var _msg = msg1 + '\n' + msg2;
@@ -2645,7 +2645,7 @@ define('tools.querytool', [
_msg = data.additional_messages + '\n' + _msg; _msg = data.additional_messages + '\n' + _msg;
} }
self.update_msg_history(true, _msg, false); self_col.update_msg_history(true, _msg, false);
/* Add the data to the collection and render the grid. /* Add the data to the collection and render the grid.
* In case of Explain draw the graph on explain panel * In case of Explain draw the graph on explain panel
@@ -2654,8 +2654,8 @@ define('tools.querytool', [
var explain_data_array = [], var explain_data_array = [],
explain_data_json = null; explain_data_json = null;
if(data.result && !_.isEmpty(self.colinfo) if(data.result && !_.isEmpty(self_col.colinfo)
&& self.colinfo[0].name == 'QUERY PLAN' && !_.isEmpty(data.types) && self_col.colinfo[0].name == 'QUERY PLAN' && !_.isEmpty(data.types)
&& data.types[0] && data.types[0].typname === 'json') { && data.types[0] && data.types[0].typname === 'json') {
/* json is sent as text, parse it */ /* json is sent as text, parse it */
explain_data_json = JSON.parse(data.result[0][0]); explain_data_json = JSON.parse(data.result[0][0]);
@@ -2669,16 +2669,16 @@ define('tools.querytool', [
explain_data_array.push(explain_data); explain_data_array.push(explain_data);
// Make sure - the 'Data Output' panel is visible, before - we // Make sure - the 'Data Output' panel is visible, before - we
// start rendering the grid. // start rendering the grid.
self.gridView.data_output_panel.focus(); self_col.gridView.data_output_panel.focus();
setTimeout( setTimeout(
function() { function() {
self.gridView.render_grid( self_col.gridView.render_grid(
explain_data_array, self.columns, self.can_edit, explain_data_array, self_col.columns, self_col.can_edit,
self.client_primary_key, 0 self_col.client_primary_key, 0
); );
// Make sure - the 'Explain' panel is visible, before - we // Make sure - the 'Explain' panel is visible, before - we
// start rendering the grid. // start rendering the grid.
self.gridView.explain_panel.focus(); self_col.gridView.explain_panel.focus();
pgExplain.DrawJSONPlan( pgExplain.DrawJSONPlan(
$('.sql-editor-explain'), explain_data_json $('.sql-editor-explain'), explain_data_json
); );
@@ -2687,17 +2687,17 @@ define('tools.querytool', [
} else { } else {
// Make sure - the 'Data Output' panel is visible, before - we // Make sure - the 'Data Output' panel is visible, before - we
// start rendering the grid. // start rendering the grid.
self.gridView.data_output_panel.focus(); self_col.gridView.data_output_panel.focus();
setTimeout( setTimeout(
function() { function() {
self.gridView.render_grid(data.result, self.columns, self_col.gridView.render_grid(data.result, self_col.columns,
self.can_edit, self.client_primary_key, data.rows_affected); self_col.can_edit, self_col.client_primary_key, data.rows_affected);
}, 10 }, 10
); );
} }
// Hide the loading icon // Hide the loading icon
self.trigger('pgadmin-sqleditor:loading-icon:hide'); self_col.trigger('pgadmin-sqleditor:loading-icon:hide');
$('#btn-flash').prop('disabled', false); $('#btn-flash').prop('disabled', false);
$('#btn-download').prop('disabled', false); $('#btn-download').prop('disabled', false);
}.bind(self) }.bind(self)
@@ -3146,8 +3146,8 @@ define('tools.querytool', [
_.each(req_data.added_index, function(v, k) { _.each(req_data.added_index, function(v, k) {
if (v == row_id) { if (v == row_id) {
// Fetch item data through row index // Fetch item data through row index
var item = grid.getDataItem(k); var item_fetched = grid.getDataItem(k);
_.extend(item, r.row_added[row_id]); _.extend(item_fetched, r.row_added[row_id]);
} }
}); });
} }
@@ -3175,8 +3175,8 @@ define('tools.querytool', [
dataView.setItems(data, self.client_primary_key); dataView.setItems(data, self.client_primary_key);
} else { } else {
dataView.beginUpdate(); dataView.beginUpdate();
for (var i = 0; i < rows.length; i++) { for (var j = 0; j < rows.length; j++) {
var item = grid.getDataItem(rows[i]); var item = grid.getDataItem(rows[j]);
data.push(item); data.push(item);
dataView.deleteItem(item[self.client_primary_key]); dataView.deleteItem(item[self.client_primary_key]);
} }
@@ -3423,11 +3423,11 @@ define('tools.querytool', [
self.is_query_changed = false; self.is_query_changed = false;
setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200); setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
}) })
.fail(function(e) { .fail(function(er) {
self.trigger('pgadmin-sqleditor:loading-icon:hide'); self.trigger('pgadmin-sqleditor:loading-icon:hide');
let stateParams = [_e]; let stateParams = [_e];
let msg = httpErrorHandler.handleQueryToolAjaxError( let msg = httpErrorHandler.handleQueryToolAjaxError(
pgAdmin, self, e, '_select_file_handler', stateParams, false pgAdmin, self, er, '_select_file_handler', stateParams, false
); );
if (msg) if (msg)
alertify.error(msg); alertify.error(msg);
@@ -3475,11 +3475,11 @@ define('tools.querytool', [
self.check_needed_confirmations_before_closing_panel(); self.check_needed_confirmations_before_closing_panel();
} }
}) })
.fail(function(e) { .fail(function(er) {
self.trigger('pgadmin-sqleditor:loading-icon:hide'); self.trigger('pgadmin-sqleditor:loading-icon:hide');
let stateParams = [_e]; let stateParams = [_e];
let msg = httpErrorHandler.handleQueryToolAjaxError( let msg = httpErrorHandler.handleQueryToolAjaxError(
pgAdmin, self, e, '_save_file_handler', stateParams, false pgAdmin, self, er, '_save_file_handler', stateParams, false
); );
if (msg) if (msg)
alertify.error(msg); alertify.error(msg);
@@ -3743,21 +3743,21 @@ define('tools.querytool', [
// split each row with field separator character // split each row with field separator character
const values = item.split(self.preferences.results_grid_field_separator); const values = item.split(self.preferences.results_grid_field_separator);
let row = {}; let row = {};
for (let k in self.columns) { for (let col in self.columns) {
let v = null; let v = null;
if (values.length > k) { if (values.length > col) {
v = values[k].replace(new RegExp(`^\\${self.preferences.results_grid_quote_char}`), '').replace(new RegExp(`\\${self.preferences.results_grid_quote_char}$`), ''); v = values[col].replace(new RegExp(`^\\${self.preferences.results_grid_quote_char}`), '').replace(new RegExp(`\\${self.preferences.results_grid_quote_char}$`), '');
} }
// set value to default or null depending on column metadata // set value to default or null depending on column metadata
if(v === '') { if(v === '') {
if(self.columns[k].has_default_val) { if(self.columns[col].has_default_val) {
v = undefined; v = undefined;
} else { } else {
v = null; v = null;
} }
} }
row[self.columns[k].name] = v; row[self.columns[col].name] = v;
} }
partial.push(row); partial.push(row);
return partial; return partial;
@@ -4054,7 +4054,7 @@ define('tools.querytool', [
} else { } else {
let respBlob = new Blob([response], {type : 'text/csv'}), let respBlob = new Blob([response], {type : 'text/csv'}),
urlCreator = window.URL || window.webkitURL, urlCreator = window.URL || window.webkitURL,
url = urlCreator.createObjectURL(respBlob), download_url = urlCreator.createObjectURL(respBlob),
current_browser = pgAdmin.Browser.get_browser(), current_browser = pgAdmin.Browser.get_browser(),
link = document.createElement('a'); link = document.createElement('a');
@@ -4064,7 +4064,7 @@ define('tools.querytool', [
// IE10+ : (has Blob, but not a[download] or URL) // IE10+ : (has Blob, but not a[download] or URL)
window.navigator.msSaveBlob(respBlob, filename); window.navigator.msSaveBlob(respBlob, filename);
} else { } else {
link.setAttribute('href', url); link.setAttribute('href', download_url);
link.setAttribute('download', filename); link.setAttribute('download', filename);
link.click(); link.click();
} }
@@ -4292,8 +4292,8 @@ define('tools.querytool', [
alertify.confirmCommit || alertify.dialog('confirmCommit', function() { alertify.confirmCommit || alertify.dialog('confirmCommit', function() {
return { return {
main: function(title, message, is_commit_disabled) { main: function(title, message, is_commit_disabled_arg) {
this.is_commit_disabled = is_commit_disabled; this.is_commit_disabled = is_commit_disabled_arg;
this.setHeader(title); this.setHeader(title);
this.setContent(message); this.setContent(message);
}, },
@@ -4359,8 +4359,8 @@ define('tools.querytool', [
alertify.confirmSave || alertify.dialog('confirmSave', function() { alertify.confirmSave || alertify.dialog('confirmSave', function() {
return { return {
main: function(title, message, is_unsaved_data) { main: function(title, message, is_unsaved_data_arg) {
this.is_unsaved_data = is_unsaved_data; this.is_unsaved_data = is_unsaved_data_arg;
this.setHeader(title); this.setHeader(title);
this.setContent(message); this.setContent(message);
}, },