Replace the generic exception class with a more specific one to fix SonarQube issues.

adityatoshniwal · akshay-joshi · commit aa679e06b27c · 2020-08-05T12:41:28.000+05:30
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ExecuteError
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \
     import DataTypeReader
 from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
@@ -52,7 +52,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -211,7 +211,7 @@ def get_formatted_columns(conn, tid, data, other_columns,
 
     status, res = conn.execute_dict(SQL)
     if not status:
-        raise Exception(res)
+        raise ExecuteError(res)
 
     all_columns = res['rows']
     edit_types = {}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \
     import trigger_definition
 from functools import wraps
@@ -50,7 +50,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -105,7 +105,7 @@ def get_sql(conn, data, tid, trid, datlastsysoid, template_path=None):
 
         status, res = conn.execute_dict(sql)
         if not status:
-            raise Exception(res)
+            raise ExecuteError(res)
         elif len(res['rows']) == 0:
             raise ObjectGone(
                 _('Could not find the compound trigger in the table.'))
@@ -162,7 +162,7 @@ def get_reverse_engineered_sql(conn, **kwargs):
 
     status, res = conn.execute_dict(SQL)
     if not status:
-        raise Exception(res)
+        raise ExecuteError(res)
 
     if len(res['rows']) == 0:
         raise ObjectGone(
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps
 
 
@@ -48,7 +48,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -163,7 +163,7 @@ def get_sql(conn, data, tid, cid=None, template_path=None):
                               tid=tid, cid=cid)
         status, res = conn.execute_dict(sql)
         if not status:
-            raise Exception(res)
+            raise ExecuteError(res)
 
         if len(res['rows']) == 0:
             raise ObjectGone(
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps
 
 
@@ -48,7 +48,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -191,7 +191,7 @@ def get_sql(conn, data, did, tid, exid=None, template_path=None):
                               did=did, tid=tid, cid=exid)
         status, res = conn.execute_dict(sql)
         if not status:
-            raise Exception(res)
+            raise ExecuteError(res)
 
         if len(res['rows']) == 0:
             raise ObjectGone(
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps
 
 
@@ -110,7 +110,7 @@ def search_coveringindex(conn, tid, cols, template_path=None):
                           tid=tid)
     status, constraints = conn.execute_dict(SQL)
     if not status:
-        raise Exception(constraints)
+        raise ExecuteError(constraints)
 
     for constraint in constraints['rows']:
         sql = render_template(
@@ -120,7 +120,7 @@ def search_coveringindex(conn, tid, cols, template_path=None):
         status, rest = conn.execute_dict(sql)
 
         if not status:
-            raise Exception(rest)
+            raise ExecuteError(rest)
 
         index_cols = set()
         for r in rest['rows']:
@@ -146,7 +146,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -254,7 +254,7 @@ def get_sql(conn, data, tid, fkid=None, template_path=None):
 
             status, res = conn.execute_dict(col_sql)
             if not status:
-                raise Exception(res)
+                raise ExecuteError(res)
 
             columns = []
             for row in res['rows']:
@@ -290,7 +290,7 @@ def _get_properties_for_fk_const(tid, fkid, data, template_path, conn):
                           tid=tid, cid=fkid)
     status, res = conn.execute_dict(sql)
     if not status:
-        raise Exception(res)
+        raise ExecuteError(res)
 
     if len(res['rows']) == 0:
         raise ObjectGone(
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps
 
 
@@ -48,7 +48,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -195,7 +195,7 @@ def get_sql(conn, data, did, tid, ctype, cid=None, template_path=None):
                               constraint_type=ctype)
         status, res = conn.execute_dict(sql)
         if not status:
-            raise Exception(res)
+            raise ExecuteError(res)
 
         if len(res['rows']) == 0:
             raise ObjectGone(
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps
 
 
@@ -48,7 +48,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -290,7 +290,7 @@ def get_reverse_engineered_sql(conn, **kwargs):
 
     status, res = conn.execute_dict(SQL)
     if not status:
-        raise Exception(res)
+        raise ExecuteError(res)
 
     if len(res['rows']) == 0:
         raise ObjectGone(_('Could not find the index in the table.'))
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps
 
 
@@ -49,7 +49,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -119,7 +119,7 @@ def get_reverse_engineered_sql(conn, **kwargs):
 
     status, res = conn.execute_dict(SQL)
     if not status:
-        raise Exception(res)
+        raise ExecuteError(res)
 
     if len(res['rows']) == 0:
         raise ObjectGone(_('Could not find the policy in the table.'))
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py
@@ -12,7 +12,7 @@
 from flask import render_template
 from flask_babelex import gettext as _
 from pgadmin.utils.ajax import internal_server_error
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \
     import trigger_definition
 from config import PG_DEFAULT_DRIVER
@@ -52,7 +52,7 @@ def get_parent(conn, tid, template_path=None):
                                     'get_parent.sql']), tid=tid)
     status, rset = conn.execute_2darray(SQL)
     if not status:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     schema = ''
     table = ''
@@ -164,7 +164,7 @@ def get_sql(conn, **kwargs):
 
         status, res = conn.execute_dict(sql)
         if not status:
-            raise Exception(res)
+            raise ExecuteError(res)
         elif len(res['rows']) == 0:
             raise ObjectGone(_('Could not find the trigger in the table.'))
 
@@ -271,7 +271,7 @@ def get_reverse_engineered_sql(conn, **kwargs):
 
     status, res = conn.execute_dict(SQL)
     if not status:
-        raise Exception(res)
+        raise ExecuteError(res)
 
     if len(res['rows']) == 0:
         raise ObjectGone(_('Could not find the trigger in the table.'))
diff --git a/web/pgadmin/tools/sqleditor/command.py b/web/pgadmin/tools/sqleditor/command.py
@@ -21,7 +21,7 @@
 from pgadmin.tools.sqleditor.utils.save_changed_data import save_changed_data
 from pgadmin.tools.sqleditor.utils.get_column_types import get_columns_types
 from pgadmin.utils.preferences import Preferences
-from pgadmin.utils.exception import ObjectGone
+from pgadmin.utils.exception import ObjectGone, ExecuteError
 
 from config import PG_DEFAULT_DRIVER
 
@@ -187,7 +187,7 @@ def __init__(self, **kwargs):
 
             status, result = conn.execute_dict(query)
             if not status:
-                raise Exception(result)
+                raise ExecuteError(result)
             if len(result['rows']) == 0:
                 raise ObjectGone(
                     gettext("The specified object could not be found."))
@@ -401,7 +401,7 @@ def get_all_columns_with_order(self, default_conn):
             )
             status, result = conn.execute_dict(query)
             if not status:
-                raise Exception(result)
+                raise ExecuteError(result)
 
             for row in result['rows']:
                 all_columns.append(row['attname'])
@@ -542,7 +542,7 @@ def get_primary_keys(self, default_conn=None):
 
             status, result = conn.execute_dict(query)
             if not status:
-                raise Exception(result)
+                raise ExecuteError(result)
 
             for row in result['rows']:
                 pk_names += driver.qtIdent(conn, row['attname']) + ','
@@ -590,7 +590,7 @@ def get_all_columns_with_order(self, default_conn=None):
         status, result = conn.execute_dict(query)
 
         if not status:
-            raise Exception(result)
+            raise ExecuteError(result)
 
         for row in result['rows']:
             all_columns.append(row['attname'])
@@ -602,7 +602,7 @@ def get_all_columns_with_order(self, default_conn=None):
         )
         status, result = conn.execute_dict(query)
         if not status:
-            raise Exception(result)
+            raise ExecuteError(result)
 
         for row in result['rows']:
             # Only append if not already present in the list
@@ -646,7 +646,7 @@ def has_oids(self, default_conn=None):
 
             status, has_oids = conn.execute_scalar(query)
             if not status:
-                raise Exception(has_oids)
+                raise ExecuteError(has_oids)
 
         else:
             raise Exception(
@@ -996,7 +996,7 @@ def __set_updatable_results_attrs(self, sql_path,
 
             status, result = conn.execute_dict(query)
             if not status:
-                raise Exception(result)
+                raise ExecuteError(result)
 
             self.nsp_name = result['rows'][0]['nspname']
             self.object_name = result['rows'][0]['relname']
diff --git a/web/pgadmin/tools/sqleditor/utils/get_column_types.py b/web/pgadmin/tools/sqleditor/utils/get_column_types.py
@@ -12,6 +12,7 @@
 """
 
 from flask import render_template
+from pgadmin.utils.exception import ExecuteError
 
 
 def get_columns_types(is_query_tool, columns_info, table_oid, conn, has_oids):
@@ -24,7 +25,7 @@ def get_columns_types(is_query_tool, columns_info, table_oid, conn, has_oids):
 
     colst, rset = conn.execute_2darray(query)
     if not colst:
-        raise Exception(rset)
+        raise ExecuteError(rset)
 
     column_types = dict()
     for key, col in enumerate(columns_info):
diff --git a/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py b/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py
diff --git a/web/pgadmin/utils/exception.py b/web/pgadmin/utils/exception.py
diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py
