IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-12-23 07:34:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that the schema diff tool should not allow comparison between Postgres Server and EDB Postgres Advanced Server. #5952

Browse Source
This commit is contained in:
Akshay Joshi 2023-03-24 13:03:35 +05:30
parent 7e8cc539dc
commit 70b2ead852
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_7_0.rst
View File

@ -53,5 +53,6 @@ Bug fixes
| `Issue #5929 <https://github.com/pgadmin-org/pgadmin4/issues/5929>`_ - Dashboard graph Y-axis width should increase with label.
| `Issue #5941 <https://github.com/pgadmin-org/pgadmin4/issues/5941>`_ - Fixed an issue where migration on external database is not working.
| `Issue #5943 <https://github.com/pgadmin-org/pgadmin4/issues/5943>`_ - Use http for SVG namespace URLs which were changed to https for SonarQube fixes.
| `Issue #5952 <https://github.com/pgadmin-org/pgadmin4/issues/5952>`_ - Ensure that the schema diff tool should not allow comparison between Postgres Server and EDB Postgres Advanced Server.
| `Issue #5955 <https://github.com/pgadmin-org/pgadmin4/issues/5955>`_ - Fix an issue where query tool is stuck when running query after discarding changed data.
| `Issue #5958 <https://github.com/pgadmin-org/pgadmin4/issues/5958>`_ - Fix an issue where new dashboard graphs are partially following theme colors.

1
web/pgadmin/browser/__init__.py
View File

@ -551,6 +551,7 @@ def get_shared_storage_list():
"""
shared_storage_config = []
shared_storage_list = []
restricted_shared_storage_list = []
if config.SERVER_MODE:
shared_storage_keys = set(['name', 'path', 'restricted_access'])
shared_storage_config = [

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

@ -447,7 +447,9 @@ def compare_database(params):
compare_pre_validation(params['trans_id'], params['source_sid'],
params['target_sid'])
if not status:
socketio.emit('compare_database_failed', error_msg,
socketio.emit('compare_database_failed',
error_msg.json if type(
error_msg) == Response else error_msg,
namespace=SOCKETIO_NAMESPACE, to=request.sid)
return error_msg
@ -586,7 +588,9 @@ def compare_schema(params):
compare_pre_validation(params['trans_id'], params['source_sid'],
params['target_sid'])
if not status:
socketio.emit('compare_schema_failed', error_msg,
socketio.emit('compare_schema_failed',
error_msg.json if type(
error_msg) == Response else error_msg,
namespace=SOCKETIO_NAMESPACE, to=request.sid)
return error_msg