mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Cleanup some code smells identified by SonarQube.
This commit is contained in:
Dave Page
parent
1485ff338f
commit
85e89c869a
@ -222,10 +222,6 @@ def upgrade():
|
||||
sql = "INSERT INTO keys (name, value) VALUES ('SECURITY_PASSWORD_SALT', 'SuperSecret3')"
|
||||
db.engine.execute(sql)
|
||||
|
||||
# Finally, update the schema version
|
||||
|
||||
# version.value = config.SETTINGS_SCHEMA_VERSION
|
||||
|
||||
db.engine.execute(
|
||||
'UPDATE version set value="%s" WHERE name = "ConfigDB"' % config.SETTINGS_SCHEMA_VERSION
|
||||
)
|
||||
|
||||
@ -77,7 +77,7 @@
|
||||
"immutability-helper": "^3.0.0",
|
||||
"imports-loader": "^0.8.0",
|
||||
"ip-address": "^5.8.9",
|
||||
"jquery": "^3.4.0",
|
||||
"jquery": "^3.5.1",
|
||||
"jquery-contextmenu": "^2.8.0",
|
||||
"jquery-ui": "^1.12.1",
|
||||
"json-bignumber": "^1.0.1",
|
||||
@ -96,7 +96,7 @@
|
||||
"tempusdominus-core": "^5.0.3",
|
||||
"underscore": "^1.9.1",
|
||||
"watchify": "~3.11.1",
|
||||
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#7a14f50a7197fe3824d706c85485a49fa9166804",
|
||||
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#be9ca6e812dfd8f44eea7ef4835ec3c8dd2bcaf3",
|
||||
"wkx": "^0.4.6"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@ -62,4 +62,4 @@ class AuthSourceRegistry(ABCMeta):
|
||||
from werkzeug.utils import find_modules
|
||||
|
||||
for module_name in find_modules(__package__, True):
|
||||
module = import_module(module_name)
|
||||
import_module(module_name)
|
||||
|
||||
@ -230,11 +230,9 @@ class DatabaseView(PGChildNodeView):
|
||||
|
||||
for row in res['rows']:
|
||||
if self.manager.db == row['name']:
|
||||
connected = True
|
||||
row['canDrop'] = False
|
||||
else:
|
||||
conn = self.manager.connection(row['name'], did=row['did'])
|
||||
connected = conn.connected()
|
||||
row['canDrop'] = True
|
||||
|
||||
return ajax_response(
|
||||
|
||||
@ -62,23 +62,14 @@ class CastsGetNodeTestCase(BaseTestGenerator):
|
||||
if self.is_list:
|
||||
response = cast_utils.api_get_cast_node(self, "")
|
||||
cast_utils.assert_status_code(self, response)
|
||||
# act_res = response.status_code
|
||||
# exp_res = self.expected_data["status_code"]
|
||||
# self.assertEquals(act_res, exp_res)
|
||||
|
||||
cast_utils.assert_error_message(self, response)
|
||||
|
||||
# act_res = response.json["errormsg"]
|
||||
# exp_res = self.expected_data["error_msg"]
|
||||
# self.assertEquals(act_res, exp_res)
|
||||
|
||||
else:
|
||||
response = cast_utils.api_get_cast_node(self,
|
||||
self.cast_id)
|
||||
cast_utils.assert_status_code(self, response)
|
||||
# act_res = response.status_code
|
||||
# exp_res = self.expected_data["status_code"]
|
||||
# self.assertEquals(act_res, exp_res)
|
||||
|
||||
else:
|
||||
self.cast_id = 12893
|
||||
response = cast_utils.api_get_cast(self, self.cast_id)
|
||||
|
||||
@ -291,7 +291,6 @@ class ForeignServerView(PGChildNodeView):
|
||||
fsid: Foreign server ID
|
||||
"""
|
||||
|
||||
res = []
|
||||
sql = render_template("/".join([self.template_path, 'properties.sql']),
|
||||
fsid=fsid, conn=self.conn)
|
||||
status, r_set = self.conn.execute_2darray(sql)
|
||||
|
||||
@ -613,7 +613,6 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare):
|
||||
:param scid: schema id
|
||||
:param dcid: FTS Dictionary id
|
||||
"""
|
||||
# data = request.args
|
||||
data = {}
|
||||
for k, v in request.args.items():
|
||||
try:
|
||||
@ -757,7 +756,6 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare):
|
||||
if not status:
|
||||
return internal_server_error(errormsg=rset)
|
||||
|
||||
datlastsysoid = self.manager.db_info[did]['datlastsysoid']
|
||||
# Empty set is added before actual list as initially it will be visible
|
||||
# at template control while creating a new FTS Dictionary
|
||||
res = [{'label': '', 'value': ''}]
|
||||
|
||||
@ -559,7 +559,6 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare):
|
||||
:param scid: schema id
|
||||
:param pid: fts tempate id
|
||||
"""
|
||||
# data = request.args
|
||||
data = {}
|
||||
for k, v in request.args.items():
|
||||
try:
|
||||
|
||||
@ -517,8 +517,6 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare):
|
||||
:param scid: schema id
|
||||
:param tid: fts tempate id
|
||||
"""
|
||||
|
||||
# data = request.args
|
||||
data = {}
|
||||
for k, v in request.args.items():
|
||||
try:
|
||||
|
||||
@ -73,7 +73,7 @@ class FunctionAddTestCase(BaseTestGenerator):
|
||||
|
||||
if self.server_version >= 120000:
|
||||
support_function_name = 'supportfunc_%s' % str(uuid.uuid4())[1:8]
|
||||
support_func = funcs_utils.create_support_internal_function(
|
||||
funcs_utils.create_support_internal_function(
|
||||
self.server,
|
||||
self.db_name,
|
||||
self.schema_name,
|
||||
|
||||
@ -44,7 +44,7 @@ class FunctionPutTestCase(BaseTestGenerator):
|
||||
|
||||
if self.server_version >= 120000:
|
||||
support_function_name = 'supportfunc_%s' % str(uuid.uuid4())[1:8]
|
||||
support_func = funcs_utils.create_support_internal_function(
|
||||
funcs_utils.create_support_internal_function(
|
||||
self.server,
|
||||
self.db_name,
|
||||
self.schema_name,
|
||||
|
||||
@ -376,8 +376,6 @@ class EdbFuncView(PGChildNodeView, DataTypeReader):
|
||||
proargdefaultvals = [ptype for ptype in
|
||||
data['proargdefaultvals'].split(",")] \
|
||||
if data['proargdefaultvals'] else []
|
||||
proallargtypes = data['proallargtypes'] \
|
||||
if data['proallargtypes'] else []
|
||||
|
||||
proargmodenames = {'i': 'IN', 'o': 'OUT', 'b': 'INOUT',
|
||||
'v': 'VARIADIC', 't': 'TABLE'}
|
||||
|
||||
@ -41,7 +41,8 @@ class PackageEDBFuncsGetTestCase(BaseTestGenerator):
|
||||
self.func_name = "func_%s" % str(uuid.uuid4())[1:8]
|
||||
self.server_id = schema_info["server_id"]
|
||||
self.db_id = schema_info["db_id"]
|
||||
server_con = server_utils.connect_server(self, self.server_id)
|
||||
|
||||
server_utils.connect_server(self, self.server_id)
|
||||
|
||||
connection = utils.get_db_connection(self.db_name,
|
||||
self.server['username'],
|
||||
|
||||
@ -1238,7 +1238,6 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings,
|
||||
"""
|
||||
data = dict()
|
||||
res = None
|
||||
sid = kwargs['sid']
|
||||
did = kwargs['did']
|
||||
scid = kwargs['scid']
|
||||
tid = kwargs['tid']
|
||||
@ -1289,7 +1288,6 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings,
|
||||
tid: Table ID
|
||||
"""
|
||||
data = dict()
|
||||
SQL = ''
|
||||
for k, v in request.args.items():
|
||||
try:
|
||||
# comments should be taken as is because if user enters a
|
||||
|
||||
@ -7,10 +7,3 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
# from pgadmin.utils.route import BaseTestGenerator
|
||||
#
|
||||
#
|
||||
# class ForeignKeyTestGenerator(BaseTestGenerator):
|
||||
#
|
||||
# def runTest(self):
|
||||
# return []
|
||||
|
||||
@ -6,11 +6,3 @@
|
||||
# This software is released under the PostgreSQL Licence
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
# from pgadmin.utils.route import BaseTestGenerator
|
||||
#
|
||||
#
|
||||
# class IndexConstraintTestGenerator(BaseTestGenerator):
|
||||
#
|
||||
# def runTest(self):
|
||||
# return []
|
||||
|
||||
@ -59,7 +59,6 @@ class SchemaDeleteMultipleTestCase(BaseTestGenerator):
|
||||
raise Exception("Could not connect to database to delete the"
|
||||
" schema.")
|
||||
|
||||
schema_id = self.schema_details[0]
|
||||
schema_name = self.schema_details[1]
|
||||
schema_response = schema_utils.verify_schemas(self.server,
|
||||
self.db_name,
|
||||
@ -67,7 +66,6 @@ class SchemaDeleteMultipleTestCase(BaseTestGenerator):
|
||||
if not schema_response:
|
||||
raise Exception("Could not find the schema to delete.")
|
||||
|
||||
schema_id = self.schema_details_1[0]
|
||||
schema_name = self.schema_details_1[1]
|
||||
schema_response = schema_utils.verify_schemas(self.server,
|
||||
self.db_name,
|
||||
|
||||
@ -96,7 +96,6 @@ def get_view_id(server, db_name, view_name):
|
||||
server['host'],
|
||||
server['port'],
|
||||
server['sslmode'])
|
||||
old_isolation_level = connection.isolation_level
|
||||
connection.set_isolation_level(0)
|
||||
pg_cursor = connection.cursor()
|
||||
# Get 'oid' from newly created view
|
||||
|
||||
@ -40,7 +40,6 @@ class RoleModule(CollectionNodeModule):
|
||||
"""
|
||||
if self.show_node:
|
||||
yield self.generate_browser_collection_node(sid)
|
||||
pass
|
||||
|
||||
@property
|
||||
def node_inode(self):
|
||||
|
||||
@ -1998,7 +1998,7 @@ define('pgadmin.browser', [
|
||||
findChildCollectionTreeNode: function(_node, _collType) {
|
||||
var tree = pgBrowser.tree,
|
||||
nodeData, idx = 0,
|
||||
node = _node,
|
||||
node,
|
||||
children = _node && tree.children(_node);
|
||||
|
||||
if (!children || !children.length)
|
||||
|
||||
@ -205,7 +205,7 @@ _.extend(pgBrowser.keyboardNavigation, {
|
||||
if(currLi.hasClass('dropdown-submenu')){
|
||||
currLi.addClass('dropdown-submenu-visible');
|
||||
currLi.find('.dropdown-menu').addClass('show');
|
||||
currLi = currLi.find('.dropdown-menu .dropdown-item').first().trigger('focus');
|
||||
currLi.find('.dropdown-menu .dropdown-item').first().trigger('focus');
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -688,9 +688,6 @@ define('pgadmin.browser.node', [
|
||||
return;
|
||||
}
|
||||
|
||||
if (!d)
|
||||
return;
|
||||
|
||||
l = gettext('Create - %s', this.label);
|
||||
p = addPanel();
|
||||
|
||||
@ -834,7 +831,7 @@ define('pgadmin.browser.node', [
|
||||
// Callback for creating script(s) & opening them in Query editor
|
||||
show_script: function(args, item) {
|
||||
var scriptType = args.script,
|
||||
obj = this,
|
||||
obj,
|
||||
t = pgBrowser.tree,
|
||||
i = item || t.selected(),
|
||||
d = i && i.length == 1 ? t.itemData(i) : undefined;
|
||||
|
||||
@ -64,5 +64,3 @@ class InternalVersionTestCase(BaseTestGenerator):
|
||||
else:
|
||||
self.assertFalse(url.endswith(version_string))
|
||||
|
||||
def tearDown(self):
|
||||
config = self.config_bak
|
||||
|
||||
1615
web/yarn.lock
1615
web/yarn.lock
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user