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

Co-authored-by: 小圈圈 <rtttte@qq.com>
nick2wang · Nov 23, 2022 · d719a14 · d719a14
1 parent 1598bb3
commit d719a14
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/sql/engines/mongo.py b/sql/engines/mongo.py
@@ -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 (
@@ -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 = "文档不存在"