Skip to content

Commit 5b16b7e

Browse files
committed
black
1 parent f5c3770 commit 5b16b7e

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

sql/engines/mysql.py

+19-16
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555

5656
class MysqlForkType(Enum):
5757
"""定义几个支持的版本类型"""
58+
5859
MYSQL = "mysql"
5960
MARIADB = "mariadb"
6061
PERCONA = "percona"
@@ -185,7 +186,7 @@ def get_all_databases(self):
185186
row[0]
186187
for row in result.rows
187188
if row[0]
188-
not in ("information_schema", "performance_schema", "mysql", "test", "sys")
189+
not in ("information_schema", "performance_schema", "mysql", "test", "sys")
189190
]
190191
result.rows = db_list
191192
return result
@@ -362,8 +363,10 @@ def get_instance_users_summary(self):
362363
sql_get_user_without_account_locked = "select concat('`', user, '`', '@', '`', host,'`') as query,user,host from mysql.user;"
363364
# MySQL 5.7.6版本, mariadb 10.4.2 起支持ACCOUNT LOCK
364365
if (
365-
self.server_fork_type == MysqlForkType.MYSQL and server_version >= (5, 7, 6)) or (
366-
self.server_fork_type == MysqlForkType.MARIADB and self.server_version >= (10, 4, 2)
366+
self.server_fork_type == MysqlForkType.MYSQL and server_version >= (5, 7, 6)
367+
) or (
368+
self.server_fork_type == MysqlForkType.MARIADB
369+
and self.server_version >= (10, 4, 2)
367370
):
368371
sql_get_user = sql_get_user_with_account_locked
369372
else:
@@ -485,13 +488,13 @@ def result_set_binary_as_hex(result_set):
485488
return result_set
486489

487490
def query(
488-
self,
489-
db_name=None,
490-
sql="",
491-
limit_num=0,
492-
close_conn=True,
493-
parameters=None,
494-
**kwargs,
491+
self,
492+
db_name=None,
493+
sql="",
494+
limit_num=0,
495+
close_conn=True,
496+
parameters=None,
497+
**kwargs,
495498
):
496499
"""返回 ResultSet"""
497500
result_set = ResultSet(full_sql=sql)
@@ -553,13 +556,13 @@ def query_check(self, db_name=None, sql=""):
553556
result["msg"] = explain_result.error
554557
# 不应该查看mysql.user表
555558
if re.match(
556-
".*(\\s)+(mysql|`mysql`)(\\s)*\\.(\\s)*(user|`user`)((\\s)*|;).*",
557-
sql.lower().replace("\n", ""),
559+
".*(\\s)+(mysql|`mysql`)(\\s)*\\.(\\s)*(user|`user`)((\\s)*|;).*",
560+
sql.lower().replace("\n", ""),
558561
) or (
559-
db_name == "mysql"
560-
and re.match(
561-
".*(\\s)+(user|`user`)((\\s)*|;).*", sql.lower().replace("\n", "")
562-
)
562+
db_name == "mysql"
563+
and re.match(
564+
".*(\\s)+(user|`user`)((\\s)*|;).*", sql.lower().replace("\n", "")
565+
)
563566
):
564567
result["bad_query"] = True
565568
result["msg"] = "您无权查看该表"

sql/engines/test_mysql.py

-1
Original file line numberDiff line numberDiff line change
@@ -485,4 +485,3 @@ def test_create_instance_user(self, _execute, _connect):
485485
}
486486
],
487487
)
488-

0 commit comments

Comments
 (0)