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

Ensure that the 'CREATE SCHEMA' statement should be present in the generated script if the schema is not present in the target database. Fixes #5816

Browse Source
This commit is contained in:
Akshay Joshi
2020-09-11 19:06:56 +05:30
parent ed1bd74301
commit a7d40e238e
7 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,8 +7,7 @@
//
//////////////////////////////////////////////////////////////
import {getTreeNodeHierarchyFromIdentifier} from 'sources/tree/pgadmin_tree_node';
import {showQueryTool} from 'tools/datagrid/static/js/show_query_tool';
import {launchDataGrid} from 'tools/datagrid/static/js/show_query_tool';
define('tools.querytool', [
'sources/gettext', 'sources/url_for', 'jquery', 'jquery.ui',
@@ -2071,34 +2070,6 @@ define('tools.querytool', [
}
};
var set_tree_node = function() {
let browser = pgWindow.default.pgAdmin.Browser;
let tree = browser.tree;
var t = tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined;
if(!d)
return;
const parentData = getTreeNodeHierarchyFromIdentifier.call(pgWindow.default.pgAdmin.Browser, i);
if(!parentData) {
return;
}
let conn_param = parentData.database || parentData.server;
var selected_tree_node = { t, i, d };
if(!pgWindow.default.pgAdmin.selected_tree_map)
pgWindow.default.pgAdmin.selected_tree_map = new Map();
pgWindow.default.pgAdmin.selected_tree_map.set(conn_param._id.toString(), selected_tree_node);
};
_.extend(
SqlEditorController.prototype,
Backbone.Events,
@@ -2111,7 +2082,6 @@ define('tools.querytool', [
//call to check whether user have closed the parent window and trying to refresh, if yes return error.
is_main_window_alive();
set_tree_node();
// Disable animation first
modifyAnimation.modifyAlertifyAnimation();
@@ -4318,16 +4288,27 @@ define('tools.querytool', [
_show_query_tool: function() {
var self = this;
var tree_node = pgWindow.default.pgAdmin.selected_tree_map.get(self.url_params.did || self.url_params.sid);
if(self.preferences.new_browser_tab) {
is_main_window_alive();
}
this._open_query_tool(tree_node);
this._open_query_tool(self);
},
_open_query_tool: function(tree_node) {
_open_query_tool: function(that) {
const transId = pgadminUtils.getRandomInt(1, 9999999);
showQueryTool(pgWindow.default.pgAdmin.DataGrid, pgWindow.default.pgAdmin.Browser, alertify, '', tree_node.i, transId);
let url_endpoint = url_for('datagrid.panel', {
'trans_id': transId,
});
url_endpoint += `?is_query_tool=${that.url_params.is_query_tool}`
+`&sgid=${that.url_params.sgid}`
+`&sid=${that.url_params.sid}`
+`&server_type=${that.url_params.server_type}`
+`&did=${that.url_params.did}`;
launchDataGrid(pgWindow.default.pgAdmin.DataGrid, transId, url_endpoint, that.url_params.title, '', alertify);
},
/*