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 'convention' related code smell reported by SonarQube.

Browse Source
This commit is contained in:
Aditya Toshniwal
2020-07-06 11:48:23 +05:30
committed by Akshay Joshi
parent fcf720a5d8
commit 45a03dd663
22 changed files with 98 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/tools/datagrid/__init__.py
View File

@@ -314,9 +314,9 @@ def initialize_query_tool(trans_id, sgid, sid, did=None):
if request.data:
_ = request.data
reqArgs = request.args
if ('recreate' in reqArgs and
reqArgs['recreate'] == '1'):
req_args = request.args
if ('recreate' in req_args and
req_args['recreate'] == '1'):
connect = False
# Create asynchronous connection using random connection id.

28
web/pgadmin/tools/debugger/__init__.py
View File

@@ -1672,7 +1672,7 @@ def get_arguments_sqlite(sid, did, scid, func_id):
"""
"""Get the count of the existing data available in sqlite database"""
DbgFuncArgsCount = DebuggerFunctionArguments.query.filter_by(
dbg_func_args_count = DebuggerFunctionArguments.query.filter_by(
server_id=sid,
database_id=did,
schema_id=scid,
@@ -1681,18 +1681,18 @@ def get_arguments_sqlite(sid, did, scid, func_id):
args_data = []
if DbgFuncArgsCount:
if dbg_func_args_count:
"""Update the Debugger Function Arguments settings"""
DbgFuncArgs = DebuggerFunctionArguments.query.filter_by(
dbg_func_args = DebuggerFunctionArguments.query.filter_by(
server_id=sid,
database_id=did,
schema_id=scid,
function_id=func_id
)
args_list = DbgFuncArgs.all()
args_list = dbg_func_args.all()
for i in range(0, DbgFuncArgsCount):
for i in range(0, dbg_func_args_count):
info = {
"arg_id": args_list[i].arg_id,
"is_null": args_list[i].is_null,
@@ -1705,13 +1705,13 @@ def get_arguments_sqlite(sid, did, scid, func_id):
# As we do have entry available for that function so we need to add
# that entry
return make_json_response(
data={'result': args_data, 'args_count': DbgFuncArgsCount}
data={'result': args_data, 'args_count': dbg_func_args_count}
)
else:
# As we do not have any entry available for that function so we need
# to add that entry
return make_json_response(
data={'result': 'result', 'args_count': DbgFuncArgsCount}
data={'result': 'result', 'args_count': dbg_func_args_count}
)
@@ -1743,7 +1743,7 @@ def set_arguments_sqlite(sid, did, scid, func_id):
try:
for i in range(0, len(data)):
DbgFuncArgsExists = DebuggerFunctionArguments.query.filter_by(
dbg_func_args_exists = DebuggerFunctionArguments.query.filter_by(
server_id=data[i]['server_id'],
database_id=data[i]['database_id'],
schema_id=data[i]['schema_id'],
@@ -1771,8 +1771,8 @@ def set_arguments_sqlite(sid, did, scid, func_id):
# Check if data is already available in database then update the
# existing value otherwise add the new value
if DbgFuncArgsExists:
DbgFuncArgs = DebuggerFunctionArguments.query.filter_by(
if dbg_func_args_exists:
dbg_func_args = DebuggerFunctionArguments.query.filter_by(
server_id=data[i]['server_id'],
database_id=data[i]['database_id'],
schema_id=data[i]['schema_id'],
@@ -1780,10 +1780,10 @@ def set_arguments_sqlite(sid, did, scid, func_id):
arg_id=data[i]['arg_id']
).first()
DbgFuncArgs.is_null = data[i]['is_null']
DbgFuncArgs.is_expression = data[i]['is_expression']
DbgFuncArgs.use_default = data[i]['use_default']
DbgFuncArgs.value = array_string
dbg_func_args.is_null = data[i]['is_null']
dbg_func_args.is_expression = data[i]['is_expression']
dbg_func_args.use_default = data[i]['use_default']
dbg_func_args.value = array_string
else:
debugger_func_args = DebuggerFunctionArguments(
server_id=data[i]['server_id'],

20
web/pgadmin/tools/grant_wizard/__init__.py
View File

@@ -376,7 +376,7 @@ def msql(sid, did):
acls['table']['acl'])
# Pass database objects and get SQL for privileges
SQL_data = ''
sql_data = ''
data_func = {'objects': data['objects'],
'priv': data['priv']['function']}
SQL = render_template(
@@ -384,7 +384,7 @@ def msql(sid, did):
'/sql/grant_function.sql']),
data=data_func, conn=conn)
if SQL and SQL.strip('\n') != '':
SQL_data += SQL
sql_data += SQL
data_seq = {'objects': data['objects'],
'priv': data['priv']['sequence']}
@@ -393,7 +393,7 @@ def msql(sid, did):
'/sql/grant_sequence.sql']),
data=data_seq, conn=conn)
if SQL and SQL.strip('\n') != '':
SQL_data += SQL
sql_data += SQL
data_table = {'objects': data['objects'],
'priv': data['priv']['table']}
@@ -401,9 +401,9 @@ def msql(sid, did):
"/".join([server_prop['template_path'], '/sql/grant_table.sql']),
data=data_table, conn=conn)
if SQL and SQL.strip('\n') != '':
SQL_data += SQL
sql_data += SQL
res = {'data': SQL_data}
res = {'data': sql_data}
return ajax_response(
response=res,
@@ -464,7 +464,7 @@ def save(sid, did):
# Pass database objects and get SQL for privileges
# Pass database objects and get SQL for privileges
SQL_data = ''
sql_data = ''
data_func = {'objects': data['objects'],
'priv': data['priv']['function']}
SQL = render_template(
@@ -472,7 +472,7 @@ def save(sid, did):
'/sql/grant_function.sql']),
data=data_func, conn=conn)
if SQL and SQL.strip('\n') != '':
SQL_data += SQL
sql_data += SQL
data_seq = {'objects': data['objects'],
'priv': data['priv']['sequence']}
@@ -481,7 +481,7 @@ def save(sid, did):
'/sql/grant_sequence.sql']),
data=data_seq, conn=conn)
if SQL and SQL.strip('\n') != '':
SQL_data += SQL
sql_data += SQL
data_table = {'objects': data['objects'],
'priv': data['priv']['table']}
@@ -489,9 +489,9 @@ def save(sid, did):
"/".join([server_prop['template_path'], '/sql/grant_table.sql']),
data=data_table, conn=conn)
if SQL and SQL.strip('\n') != '':
SQL_data += SQL
sql_data += SQL
status, res = conn.execute_dict(SQL_data)
status, res = conn.execute_dict(sql_data)
if not status:
return internal_server_error(errormsg=res)

2
web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py
View File

@@ -86,7 +86,7 @@ class SearchObjectsHelperTest(BaseTestGenerator):
for data in blueprints:
if node_type == data['node_type']:
blueprint = MagicMock(
BackendSupported=MagicMock(
backend_supported=MagicMock(
return_value=data['backend_supported']),
collection_label=data['coll_label'],
show_node=data['backend_supported'],

4
web/pgadmin/tools/search_objects/utils.py
View File

@@ -71,8 +71,8 @@ class SearchObjectsHelper:
if blueprint is None:
continue
if blueprint.BackendSupported(self.manager, is_catalog=False,
did=self.did) or skip_check:
if blueprint.backend_supported(self.manager, is_catalog=False,
did=self.did) or skip_check:
if node_type in ['edbfunc', 'edbproc']:
return_types[node_type] =\
gettext('Package {0}').format(