Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复mongo正则匹配与method取值问题 #1973

Merged
merged 2 commits into from
Nov 23, 2022
Merged

修复mongo正则匹配与method取值问题 #1973

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05a7320
修复mongo正则匹配与method取值问题
nick2wang Nov 21, 2022
b229300
Merge branch 'master' into fix-mongo-match-bug
hhyo Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions sql/engines/mongo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ def execute_check(self, db_name=None, sql=""):
"renameCollection",
]
pattern = re.compile(
r"""^db\.createCollection\(([\s\S]*)\)$|^db\.([\w\.-]+)\.(?:[A-Za-z]+)(?:\([\s\S]*\)$)|^db\.getCollection\((?:\s*)(?:'|")([\w-]*)('|")(\s*)\)\.([A-Za-z]+)(\([\s\S]*\)$)"""
r"""^db\.createCollection\(([\s\S]*)\)$|^db\.([\w\.-]+)\.(?:[A-Za-z]+)(?:\([\s\S]*\)$)|^db\.getCollection\((?:\s*)(?:'|")([\w\.-]+)('|")(\s*)\)\.([A-Za-z]+)(\([\s\S]*\)$)"""
)
m = pattern.match(check_sql)
if (
Expand Down Expand Up @@ -571,10 +571,8 @@ def execute_check(self, db_name=None, sql=""):
check_result.rows += [result]
continue
else:
# method = sql_str.split('.')[2]
# methodStr = method.split('(')[0].strip()
methodStr = (
sql_str.split("(")[0].split(".")[-1].strip()
sql_str.split(".")[-1].split("(")[0].strip()
) # 最后一个.和括号(之间的字符串作为方法
if methodStr in is_exist_premise_method and not is_in:
check_result.error = "文档不存在"
Expand Down