From c304d3e90e986e953077fc08308b688a6d219e87 Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Mon, 11 Apr 2016 17:15:55 +0530 Subject: [PATCH] Save the database OID of the maintenance database. --- web/pgadmin/utils/driver/psycopg2/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py index 849637950..aeb68048a 100644 --- a/web/pgadmin/utils/driver/psycopg2/__init__.py +++ b/web/pgadmin/utils/driver/psycopg2/__init__.py @@ -302,10 +302,14 @@ FROM WHERE db.datname = current_database()""") if status: - mgr.db_info = dict() + mgr.db_info = mgr.db_info or dict() f_row = res['rows'][0] mgr.db_info[f_row['did']] = f_row.copy() + # We do not have database oid for the maintenance database. + if len(mgr.db_info) == 1: + mgr.did = f_row['did'] + status, res = self.execute_dict(""" SELECT oid as id, rolname as name, rolsuper as is_superuser, @@ -996,6 +1000,7 @@ class ServerManager(object): self.host = server.host self.port = server.port self.db = server.maintenance_db + self.did = None self.user = server.username self.password = server.password self.role = server.role