diff --git a/web/pgadmin/utils/driver/psycopg2/connection.py b/web/pgadmin/utils/driver/psycopg2/connection.py index 2291db4b2..230b2a999 100644 --- a/web/pgadmin/utils/driver/psycopg2/connection.py +++ b/web/pgadmin/utils/driver/psycopg2/connection.py @@ -52,6 +52,7 @@ _ = gettext register_global_typecasters() configureDriverEncodings(encodings) + class Connection(BaseConnection): """ class Connection(object) @@ -408,7 +409,6 @@ class Connection(BaseConnection): "SET client_encoding='{0}';" .format(postgres_encoding)) - if status is not None: self.conn.close() self.conn = None diff --git a/web/pgadmin/utils/driver/psycopg2/encoding.py b/web/pgadmin/utils/driver/psycopg2/encoding.py index 33a2c90f6..1f4a04f74 100644 --- a/web/pgadmin/utils/driver/psycopg2/encoding.py +++ b/web/pgadmin/utils/driver/psycopg2/encoding.py @@ -35,6 +35,7 @@ def getEncoding(key): """ return encode_dict.get(key, ['UNICODE', 'utf-8']) + def configureDriverEncodings(encodings): # Replace the python encoding for original name and renamed encodings # psycopg2 removes the underscore in conn.encoding