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

Fixed code smells 'Define a constant instead of duplicating this literal' reported by SonarQube.

Browse Source
This commit is contained in:
Akshay Joshi
2020-09-29 15:08:14 +05:30
parent c7c199210d
commit 1c70a43b91
22 changed files with 167 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/pgadmin/tools/sqleditor/__init__.py
View File

@@ -50,6 +50,7 @@ from pgadmin.tools.sqleditor.utils.macros import get_macros,\
get_user_macros, set_macros
MODULE_NAME = 'sqleditor'
TRANSACTION_STATUS_CHECK_FAILED = gettext("Transaction status check failed.")
class SqlEditorModule(PgAdminModule):
@@ -1292,16 +1293,17 @@ def save_file():
enc = get_file_encoding_of_loaded_file(os.path.basename(file_path))
file_content = file_data['file_content'].encode(enc)
error_str = gettext("Error: {0}")
# write to file
try:
with open(file_path, 'wb+') as output_file:
output_file.write(file_content)
except IOError as e:
err_msg = gettext("Error: {0}").format(e.strerror)
err_msg = error_str.format(e.strerror)
return internal_server_error(errormsg=err_msg)
except Exception as e:
err_msg = gettext("Error: {0}").format(e.strerror)
err_msg = error_str.format(e.strerror)
return internal_server_error(errormsg=err_msg)
return make_json_response(
@@ -1324,7 +1326,7 @@ def start_query_download_tool(trans_id):
if not status or sync_conn is None or trans_obj is None or \
session_obj is None:
return internal_server_error(
errormsg=gettext("Transaction status check failed.")
errormsg=TRANSACTION_STATUS_CHECK_FAILED
)
data = request.values if request.values else None
@@ -1443,11 +1445,11 @@ def query_tool_status(trans_id):
)
else:
return internal_server_error(
errormsg=gettext("Transaction status check failed.")
errormsg=TRANSACTION_STATUS_CHECK_FAILED
)
else:
return internal_server_error(
errormsg=gettext("Transaction status check failed.")
errormsg=TRANSACTION_STATUS_CHECK_FAILED
)

17
web/pgadmin/tools/sqleditor/command.py
View File

@@ -361,6 +361,7 @@ class GridCommand(BaseCommand, SQLFilter, FetchedRowTracker):
self.conn_id = kwargs['conn_id'] if 'conn_id' in kwargs else None
self.cmd_type = kwargs['cmd_type'] if 'cmd_type' in kwargs else None
self.limit = -1
self._OBJECT_QUERY_SQL = 'objectquery.sql'
if self.cmd_type in (VIEW_FIRST_100_ROWS, VIEW_LAST_100_ROWS):
self.limit = 100
@@ -499,14 +500,14 @@ class TableCommand(GridCommand):
if sql_filter is None:
sql = render_template(
"/".join([self.sql_path, 'objectquery.sql']),
"/".join([self.sql_path, self._OBJECT_QUERY_SQL]),
object_name=self.object_name,
nsp_name=self.nsp_name, limit=self.limit, has_oids=has_oids,
data_sorting=data_sorting
)
else:
sql = render_template(
"/".join([self.sql_path, 'objectquery.sql']),
"/".join([self.sql_path, self._OBJECT_QUERY_SQL]),
object_name=self.object_name,
nsp_name=self.nsp_name, limit=self.limit, has_oids=has_oids,
sql_filter=sql_filter, data_sorting=data_sorting
@@ -716,13 +717,13 @@ class ViewCommand(GridCommand):
if sql_filter is None:
sql = render_template(
"/".join([self.sql_path, 'objectquery.sql']),
"/".join([self.sql_path, self._OBJECT_QUERY_SQL]),
object_name=self.object_name, nsp_name=self.nsp_name,
limit=self.limit, data_sorting=data_sorting
)
else:
sql = render_template(
"/".join([self.sql_path, 'objectquery.sql']),
"/".join([self.sql_path, self._OBJECT_QUERY_SQL]),
object_name=self.object_name, nsp_name=self.nsp_name,
sql_filter=sql_filter, limit=self.limit,
data_sorting=data_sorting
@@ -777,13 +778,13 @@ class ForeignTableCommand(GridCommand):
if sql_filter is None:
sql = render_template(
"/".join([self.sql_path, 'objectquery.sql']),
"/".join([self.sql_path, self._OBJECT_QUERY_SQL]),
object_name=self.object_name, nsp_name=self.nsp_name,
limit=self.limit, data_sorting=data_sorting
)
else:
sql = render_template(
"/".join([self.sql_path, 'objectquery.sql']),
"/".join([self.sql_path, self._OBJECT_QUERY_SQL]),
object_name=self.object_name, nsp_name=self.nsp_name,
sql_filter=sql_filter, limit=self.limit,
data_sorting=data_sorting
@@ -828,13 +829,13 @@ class CatalogCommand(GridCommand):
if sql_filter is None:
sql = render_template(
"/".join([self.sql_path, 'objectquery.sql']),
"/".join([self.sql_path, self._OBJECT_QUERY_SQL]),
object_name=self.object_name, nsp_name=self.nsp_name,
limit=self.limit, data_sorting=data_sorting
)
else:
sql = render_template(
"/".join([self.sql_path, 'objectquery.sql']),
"/".join([self.sql_path, self._OBJECT_QUERY_SQL]),
object_name=self.object_name, nsp_name=self.nsp_name,
sql_filter=sql_filter, limit=self.limit,
data_sorting=data_sorting