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 an issue where fetching the schema throws an error if the database

Browse Source 
is not connected in Schema Diff. Fixes #5673

Maintenance Database is selected by default in Schema Diff.
This commit is contained in:
Akshay Joshi 2020-07-15 13:07:28 +05:30
parent bd9dc97b4f
commit 2469032f15
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/en_US/release_notes_4_24.rst
View File

@ -39,4 +39,5 @@ Bug fixes
| `Issue #5630 <https://redmine.postgresql.org/issues/5630>`_ - Fixed an issue where installation of pgadmin4 not working on 32-bit Windows. | `Issue #5630 <https://redmine.postgresql.org/issues/5630>`_ - Fixed an issue where installation of pgadmin4 not working on 32-bit Windows.
| `Issue #5631 <https://redmine.postgresql.org/issues/5631>`_ - Fixed 'cant execute empty query' issue when remove the value of 'USING' or 'WITH CHECK' option of RLS Policy. | `Issue #5631 <https://redmine.postgresql.org/issues/5631>`_ - Fixed 'cant execute empty query' issue when remove the value of 'USING' or 'WITH CHECK' option of RLS Policy.
| `Issue #5633 <https://redmine.postgresql.org/issues/5633>`_ - Ensure that create RLS Policy menu should not be visible for catalog objects. | `Issue #5633 <https://redmine.postgresql.org/issues/5633>`_ - Ensure that create RLS Policy menu should not be visible for catalog objects.
| `Issue #5662 <https://redmine.postgresql.org/issues/5662>`_ - Fixed accessibility issue where few dialogs are not rendering properly when we zoomed in browser window 200% and screen resolution is low. | `Issue #5662 <https://redmine.postgresql.org/issues/5662>`_ - Fixed accessibility issue where few dialogs are not rendering properly when we zoomed in browser window 200% and screen resolution is low.
| `Issue #5673 <https://redmine.postgresql.org/issues/5673>`_ - Fixed an issue where fetching the schema throws an error if the database is not connected in Schema Diff.

20
web/pgadmin/tools/schema_diff/__init__.py
View File

@ -387,7 +387,8 @@ def databases(sid):
"connected": db['connected'], "connected": db['connected'],
"allowConn": db['allowConn'], "allowConn": db['allowConn'],
"image": db['icon'], "image": db['icon'],
"canDisconn": db['canDisconn'] "canDisconn": db['canDisconn'],
"is_maintenance_db": db['label'] == server.maintenance_db
}) })
except Exception as e: except Exception as e:
@ -412,14 +413,15 @@ def schemas(sid, did):
view = SchemaDiffRegistry.get_node_view('schema') view = SchemaDiffRegistry.get_node_view('schema')
server = Server.query.filter_by(id=sid).first() server = Server.query.filter_by(id=sid).first()
response = view.nodes(gid=server.servergroup_id, sid=sid, did=did) response = view.nodes(gid=server.servergroup_id, sid=sid, did=did)
schemas = json.loads(response.data)['data'] if response.status_code == 200:
for sch in schemas: schemas = json.loads(response.data)['data']
res.append({ for sch in schemas:
"value": sch['_id'], res.append({
"label": sch['label'], "value": sch['_id'],
"_id": sch['_id'], "label": sch['label'],
"image": sch['icon'], "_id": sch['_id'],
}) "image": sch['icon'],
})
except Exception as e: except Exception as e:
app.logger.exception(e) app.logger.exception(e)

12
web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js
View File

@ -590,8 +590,10 @@ export default class SchemaDiffUI {
if (!_.isUndefined(m.get('source_sid')) && !_.isNull(m.get('source_sid')) if (!_.isUndefined(m.get('source_sid')) && !_.isNull(m.get('source_sid'))
&& m.get('source_sid') !== '') { && m.get('source_sid') !== '') {
setTimeout(function() { setTimeout(function() {
if (self_local.options.length > 0) { for (var i = 0; i < self_local.options.length; i++) {
m.set('source_did', self_local.options[0].value); if (self_local.options[i].is_maintenance_db) {
m.set('source_did', self_local.options[i].value);
}
} }
}, 10); }, 10);
return false; return false;
@ -679,8 +681,10 @@ export default class SchemaDiffUI {
if (!_.isUndefined(m.get('target_sid')) && !_.isNull(m.get('target_sid')) if (!_.isUndefined(m.get('target_sid')) && !_.isNull(m.get('target_sid'))
&& m.get('target_sid') !== '') { && m.get('target_sid') !== '') {
setTimeout(function() { setTimeout(function() {
if (self.options.length > 0) { for (var i = 0; i < self.options.length; i++) {
m.set('target_did', self.options[0].value); if (self.options[i].is_maintenance_db) {
m.set('target_did', self.options[i].value);
}
} }
}, 10); }, 10);
return false; return false;