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

Handle errors properly if they occur when renaming a database. Fixes #3353

Browse Source
This commit is contained in:
Akshay Joshi 2018-05-28 17:35:33 -04:00 committed by Dave Page
parent 9f13865777
commit 08990cb1de
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_3_1.rst
View File

@ -32,3 +32,4 @@ Bug fixes
| `Bug #3324 <https://redmine.postgresql.org/issues/3324>`_ - Fix the template loader to work reliably under Windows (fixing external tables under Greenplum) | `Bug #3324 <https://redmine.postgresql.org/issues/3324>`_ - Fix the template loader to work reliably under Windows (fixing external tables under Greenplum)
| `Bug #3333 <https://redmine.postgresql.org/issues/3333>`_ - Ensure the runtime core application is setup before trying to access any settings | `Bug #3333 <https://redmine.postgresql.org/issues/3333>`_ - Ensure the runtime core application is setup before trying to access any settings
| `Bug #3342 <https://redmine.postgresql.org/issues/3342>`_ - Set SESSION_COOKIE_SAMESITE='Lax' per Flask recommendation to prevents sending cookies with CSRF-prone requests from external sites, such as submitting a form | `Bug #3342 <https://redmine.postgresql.org/issues/3342>`_ - Set SESSION_COOKIE_SAMESITE='Lax' per Flask recommendation to prevents sending cookies with CSRF-prone requests from external sites, such as submitting a form
| `Bug #3353 <https://redmine.postgresql.org/issues/3353>`_ - Handle errors properly if they occur when renaming a database

11
web/pgadmin/browser/server_groups/servers/databases/__init__.py
View File

@ -634,6 +634,17 @@ class DatabaseView(PGChildNodeView):
if SQL and SQL != "": if SQL and SQL != "":
status, msg = conn.execute_scalar(SQL) status, msg = conn.execute_scalar(SQL)
if not status: if not status:
# In case of error from server while rename it,
# reconnect to the database with old name again.
self.conn = self.manager.connection(
database=data['old_name'], auto_reconnect=True
)
status, errmsg = self.conn.connect()
if not status:
current_app.logger.error(
'Could not reconnected to database(#{0}).\n'
'Error: {1}'.format(did, errmsg)
)
return internal_server_error(errormsg=msg) return internal_server_error(errormsg=msg)
# Make connection for database again # Make connection for database again