IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-22 08:46:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where Backup, Restore, and Maintenance not working if connection timeout is set in the server dialog. #5959

Browse Source
This commit is contained in:
Akshay Joshi 2023-03-27 17:41:19 +05:30
parent 66cb4e3bcf
commit 12f82820c9
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en_US/release_notes_7_0.rst
View File

@ -20,6 +20,7 @@ Bundled PostgreSQL Utilities
New features
************
| `Issue #3298 <https://github.com/pgadmin-org/pgadmin4/issues/3298>`_ - Auto expand row edit form when a new row is added for Primary Key, Foreign Key, Unique Constraint and Exclusion Constraint.
| `Issue #5014 <https://github.com/pgadmin-org/pgadmin4/issues/5014>`_ - Added support for mounting shared storage in server mode.
| `Issue #5022 <https://github.com/pgadmin-org/pgadmin4/issues/5022>`_ - Add a note on top of keyboard shortcuts preferences to show the Accesskey of the browser.
| `Issue #5750 <https://github.com/pgadmin-org/pgadmin4/issues/5750>`_ - Added capability to deploy PostgreSQL servers on Google Cloud.
@ -60,4 +61,5 @@ Bug 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.
| `Issue #5959 <https://github.com/pgadmin-org/pgadmin4/issues/5959>`_ - Fix an issue where Backup, Restore, and Maintenance not working if connection timeout is set in the server dialog.
| `Issue #6018 <https://github.com/pgadmin-org/pgadmin4/issues/6018>`_ - Change the foreground color of the code mirror text for Dark Theme.

2
web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
View File

@ -2251,7 +2251,7 @@ class MViewNode(ViewNode, VacuumSettings):
# Check for connection timeout and if it is greater than 0
# then set the environment variable PGCONNECT_TIMEOUT.
timeout = manager.get_connection_param_value('connect_timeout')
if timeout and timeout > 0:
if timeout and int(timeout) > 0:
env = dict()
env['PGCONNECT_TIMEOUT'] = str(timeout)
p.set_env_variables(server, env=env)

2
web/pgadmin/tools/backup/__init__.py
View File

@ -406,7 +406,7 @@ def create_backup_objects_job(sid):
# Check for connection timeout and if it is greater than 0 then
# set the environment variable PGCONNECT_TIMEOUT.
timeout = manager.get_connection_param_value('connect_timeout')
if timeout and timeout > 0:
if timeout and int(timeout) > 0:
env = dict()
env['PGCONNECT_TIMEOUT'] = str(timeout)
p.set_env_variables(server, env=env)

2
web/pgadmin/tools/maintenance/__init__.py
View File

@ -252,7 +252,7 @@ def create_maintenance_job(sid, did):
# Check for connection timeout and if it is greater than 0 then
# set the environment variable PGCONNECT_TIMEOUT.
timeout = manager.get_connection_param_value('connect_timeout')
if timeout and timeout > 0:
if timeout and int(timeout) > 0:
env = dict()
env['PGCONNECT_TIMEOUT'] = str(timeout)
p.set_env_variables(server, env=env)

2
web/pgadmin/tools/restore/__init__.py
View File

@ -383,7 +383,7 @@ def create_restore_job(sid):
# Check for connection timeout and if it is greater than 0 then
# set the environment variable PGCONNECT_TIMEOUT.
timeout = manager.get_connection_param_value('connect_timeout')
if timeout and timeout > 0:
if timeout and int(timeout) > 0:
env = dict()
env['PGCONNECT_TIMEOUT'] = str(timeout)
p.set_env_variables(server, env=env)