mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
1) Port query tool to React. Fixes #6131
2) Added status bar to the Query Tool. Fixes #3253 3) Ensure that row numbers should be visible in view when scrolling horizontally. Fixes #3989 4) Allow removing a single query history. Refs #4113 5) Partially fixed Macros usability issues. Ref #6969 6) Fixed an issue where the Query tool opens on minimum size if the user opens multiple query tool Window quickly. Fixes #6725 7) Relocate GIS Viewer Button to the Left Side of the Results Table. Fixes #6830 8) Fixed an issue where the connection bar is not visible. Fixes #7188 9) Fixed an issue where an Empty message popup after running a query. Fixes #7260 10) Ensure that Autocomplete should work after changing the connection. Fixes #7262 11) Fixed an issue where the copy and paste row does not work if the first column contains no data. Fixes #7294
This commit is contained in:
committed by
Akshay Joshi
parent
bf8e569bde
commit
b5b9ee46a1
@@ -15,8 +15,7 @@ import Backbone from 'backbone';
|
||||
import Slick from 'sources/../bundle/slickgrid';
|
||||
import pgAdmin from 'sources/pgadmin';
|
||||
import {setPGCSRFToken} from 'sources/csrf';
|
||||
import {generateScript} from 'tools/datagrid/static/js/show_query_tool';
|
||||
import 'pgadmin.sqleditor';
|
||||
import 'pgadmin.tools.sqleditor';
|
||||
import pgWindow from 'sources/window';
|
||||
import _ from 'underscore';
|
||||
import Notify from '../../../../static/js/helpers/Notifier';
|
||||
@@ -27,6 +26,7 @@ import { SchemaDiffSelect2Control, SchemaDiffHeaderView,
|
||||
|
||||
import { handleDependencies, selectDependenciesForGroup,
|
||||
selectDependenciesForAll, selectDependencies } from './schema_diff_dependency';
|
||||
import { generateScript } from '../../../sqleditor/static/js/show_query_tool';
|
||||
|
||||
var wcDocker = window.wcDocker;
|
||||
|
||||
@@ -252,6 +252,7 @@ export default class SchemaDiffUI {
|
||||
let data = res.data;
|
||||
let server_data = {};
|
||||
if (data) {
|
||||
let sqlId = `schema${self.trans_id}`;
|
||||
server_data['sgid'] = data.gid;
|
||||
server_data['sid'] = data.sid;
|
||||
server_data['stype'] = data.type;
|
||||
@@ -259,13 +260,13 @@ export default class SchemaDiffUI {
|
||||
server_data['user'] = data.user;
|
||||
server_data['did'] = self.model.get('target_did');
|
||||
server_data['database'] = data.database;
|
||||
server_data['sql_id'] = sqlId;
|
||||
|
||||
if (_.isUndefined(generated_script)) {
|
||||
generated_script = script_header + 'BEGIN;' + '\n' + self.model.get('diff_ddl') + '\n' + 'END;';
|
||||
}
|
||||
|
||||
pgWindow.pgAdmin.ddl_diff = generated_script;
|
||||
generateScript(server_data, pgWindow.pgAdmin.DataGrid, Alertify);
|
||||
localStorage.setItem(sqlId, generated_script);
|
||||
generateScript(server_data, pgWindow.pgAdmin.Tools.SQLEditor, Alertify);
|
||||
}
|
||||
|
||||
$('#diff_fetching_data').find('.schema-diff-busy-text').text('');
|
||||
|
Reference in New Issue
Block a user