diff --git a/pydbapi/db/base.py b/pydbapi/db/base.py
index dc54c60..eab56ab 100644
--- a/pydbapi/db/base.py
+++ b/pydbapi/db/base.py
@@ -2,7 +2,7 @@
 # @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
 # @Last Modified by:   longfengpili
-# @Last Modified time: 2024-08-12 14:00:32
+# @Last Modified time: 2024-10-12 11:05:06
 # @github: https://github.com/longfengpili
 
 
@@ -40,9 +40,8 @@ def prepare_sql_statements(self, sql, verbose):
         else:
             from tqdm import tqdm
 
-        sqls = SqlParse.split_sqls(sql)
-        # print(sqls)
-        sqls = [sql.strip() for sql in sqls if sql]
+        sqlparse = SqlParse(sql)
+        sqls = [stmt.value.strip(' ;') for stmt in sqlparse.statements]
         bar_format = '{l_bar}{bar}| {n_fmt}/{total_fmt} [{elapsed}<{remaining}] {postfix[0]}'
         sqls = sqls if verbose <= 1 else tqdm(sqls, postfix=['START'], bar_format=bar_format)  # 如果verbose>=2则显示进度条
         return sqls
diff --git a/pydbapi/sql/__init__.py b/pydbapi/sql/__init__.py
index 45bd7d0..7f3eede 100644
--- a/pydbapi/sql/__init__.py
+++ b/pydbapi/sql/__init__.py
@@ -2,11 +2,12 @@
 # @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
 # @Last Modified by:   longfengpili
-# @Last Modified time: 2023-07-27 15:35:17
+# @Last Modified time: 2024-10-11 10:51:22
 # @github: https://github.com/longfengpili
 
 
-from .parse import SqlParse, SqlFileParse
+from .parse import SqlParse
+from .fileparse import SqlFileParse
 from .compile import SqlCompile
 
 __all__ = ['SqlParse', 'SqlCompile', 'SqlFileParse']
diff --git a/pydbapi/sql/fileparse.py b/pydbapi/sql/fileparse.py
new file mode 100644
index 0000000..a16bff9
--- /dev/null
+++ b/pydbapi/sql/fileparse.py
@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+# @Author: longfengpili
+# @Date:   2023-06-02 15:27:41
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2024-10-11 14:52:55
+# @github: https://github.com/longfengpili
+
+
+import re
+import os
+from datetime import datetime, date, timedelta
+from typing import Any, Dict, List, Tuple
+
+from .parse import SqlParse
+
+import logging
+sqllogger = logging.getLogger(__name__)
+
+
+class SqlFileParse(object):
+
+    def __init__(self, filepath):
+        self.filepath = filepath
+
+    def get_content(self):
+        if not os.path.isfile(self.filepath):
+            raise Exception(f'File 【{self.filepath}】 not exists !')
+
+        with open(self.filepath, 'r', encoding='utf-8') as f:
+            content = f.read()
+        return content
+
+    def parse_argument(self, argument: str, arguments: Dict[str, Any]) -> Tuple[str, Any]:
+        key, value = argument.split('=', 1)
+        key, value = key.strip(), value.strip()
+        try:
+            globals_value = {'timedelta': timedelta}
+            value = eval(value, globals_value, arguments)
+        except NameError as e:
+            raise NameError(f"{e}, please set it before '{key}' !!!")
+        return key, value
+
+    def get_arguments_infile(self, content: str):
+        '''[summary]
+
+        [description]
+            获取文件中配置的arguments
+        Returns:
+            [dict] -- [返回文件中的参数设置]
+        '''
+        arguments = {
+            'today': date.today(),
+            'now': datetime.now(),
+        }
+        arguments_infile = re.findall(r'(?<!--)\s*#【arguments】#\s*\n(.*?)#【arguments】#', content, re.S)
+        arguments_infile = ';'.join(arguments_infile).replace('\n', ';')
+        arguments_infile = [argument.strip() for argument in arguments_infile.split(';') if argument]
+        for argument in arguments_infile:
+            if argument.startswith('--'):
+                continue
+
+            key, value = self.parse_argument(argument, arguments)
+            arguments[key] = value
+
+        arguments = {k: f"'{datetime.strftime(v, '%Y-%m-%d %H:%M:%S')}'" if isinstance(v, datetime)
+                        else f"'{datetime.strftime(v, '%Y-%m-%d')}'" if isinstance(v, date)
+                        else v for k, v in arguments.items()}  # 处理时间
+        # print(arguments)
+        return arguments
+
+    def get_sqls_infile(self, content: str):
+        sqls = re.findall(r'(?<!--)\s*###\s*\n(.*?)###', content, re.S)
+        return sqls
+
+    def parse_file(self):
+        content = self.get_content()
+        arguments = self.get_arguments_infile(content)
+        sqls = self.get_sqls_infile(content)
+        return arguments, sqls
+
+    def update_arguments(self, arguments_infile: Dict[str, Any], **kwargs: Dict[str, Any]) -> Dict[str, Any]:
+        '''[summary]
+
+        [description]
+            替换具体的参数值，传入的参数值会覆盖文件中设置的参数值
+        Arguments:
+            **kwargs {[参数]} -- [传入的参数值]
+
+        Returns:
+            [str] -- [替换过后的内容]
+
+        '''
+        # 获取文件名
+        filename = os.path.basename(self.filepath)
+        
+        # 过滤掉值为空的参数
+        kwargs = {k: v for k, v in kwargs.items() if v}
+        # 组合文件参数和传入参数
+        arguments_final = {**arguments_infile, **kwargs}
+
+        # 记录最终参数的日志
+        if arguments_final:
+            arglog = f"【Final Arguments】【{filename}】 Use arguments {arguments_final}"
+        else:
+            arglog = f"【Final Arguments】【{filename}】 no arguments !!!"
+
+        # 计算文件参数和传入参数的交集，并记录日志
+        arguments_same = set(arguments_infile) & set(kwargs)
+        if arguments_same:
+            arguments_same = sorted(arguments_same)
+            file_arg = {arg: arguments_infile.get(arg) for arg in arguments_same}
+            argsamelog = f"Replace FileSetting {file_arg}"
+            arglog = f"{arglog}, {argsamelog}"
+        
+        sqllogger.warning(arglog)
+
+        return arguments_final
+
+    def get_filesqls(self, with_test: bool = False, with_snum: int = 0, **kwargs: Any) -> Tuple[Dict[str, Any], Dict[str, str]]:
+        fsqls = {}
+        content = self.get_content()
+        arguments_infile = self.get_arguments_infile(content)
+        farguments = self.update_arguments(arguments_infile, **kwargs)
+        sqls = self.get_sqls_infile(content)
+
+        for idx, sql in enumerate(sqls):
+            sqlparser = SqlParse(sql)
+            purpose = f"【{idx + 1:0>3d}】{sqlparser.purpose}"
+            sql = sqlparser.substitute_parameters(**farguments)
+
+            if with_test:
+                first_stmt = sqlparser.get_statement()
+                subqueries = sqlparser.get_subqueries(first_stmt.tokens, keep_last=False)
+                combination_sqls = sqlparser.combination_sqls
+                print(len(combination_sqls))
+                fsqls[f"{purpose}_{with_snum:03d}"] = combination_sqls[with_snum-1]
+            else:
+                fsqls[purpose] = sql
+
+        return farguments, fsqls
diff --git a/pydbapi/sql/parse.py b/pydbapi/sql/parse.py
index 5da2fad..04dbccc 100644
--- a/pydbapi/sql/parse.py
+++ b/pydbapi/sql/parse.py
@@ -1,264 +1,193 @@
-# -*- coding: utf-8 -*-
-# @Author: longfengpili
-# @Date:   2023-06-02 15:27:41
-# @Last Modified by:   longfengpili
-# @Last Modified time: 2024-09-29 11:45:27
-# @github: https://github.com/longfengpili
-
-
-import re
-import os
-from datetime import datetime, date, timedelta
-from typing import Any, Dict, List, Tuple
-
-import logging
-sqllogger = logging.getLogger(__name__)
-
-
-class SqlParse(object):
-
-    def __init__(self, orisql):
-        self.orisql = orisql
-
-    @property
-    def purpose(self):
-        purpose = re.match('-- *(【.*?】)\n', self.orisql.strip())
-        purpose = f"{purpose.group(1)}" if purpose else 'No Description'
-        return purpose
-
-    @property
-    def sql(self):
-        sql = re.sub('^--.*?\n', '\n', self.orisql.strip() + '\n')
-        sql = re.sub('--.*?\n', '\n', sql)  # 去掉注释
-        return sql.strip().rstrip(';')
-
-    @staticmethod
-    def split_sqls(sql):
-        sql = sql.strip()
-        sql = sql if sql.endswith(';') else sql + ';'
-        sql_r1 = re.sub('; *\n', ';\n', sql)  # 处理多余的；
-        sql_r2 = re.sub(';$', ';\n', sql_r1)  # 末尾增加'\n'
-        sqls = re.split(';\n', sql_r2)[:-1]
-        return sqls
-
-    @property
-    def comment(self):
-        orisql = self.orisql.strip()
-        orisql = orisql if orisql.endswith(';') else orisql + ';'
-        comment = re.search('^-- *(.*?)\n', orisql)
-        comment = comment.group(1).strip() if comment else ''
-        return comment
-
-    @property
-    def action(self):
-        if not self.sql:
-            return 'NoSql'
-
-        sql = self.sql.replace('\n', '')
-        splits = sql.split(' ')
-        action = splits[0]
-        if splits[1].lower() == 'index':
-            action += splits[1]
-        return action.upper()
-
-    @property
-    def tablename(self):
-        sql = self.sql
-        patterns = [
-            r'create (?:temp |temporary )?table (?:if not exists |if exists )?([\w.]+)',
-            r'update\s+([\w.]+)',
-            r'delete\s+(?:from\s+)?([\w.]+)',
-            r'insert\s+into\s+([\w.]+)',
-            r'from\s+([\w.]+)',
-            r'on\s+([\w.]+)',
-            r'join\s+([\w.]+)',  # 增加对 JOIN 语句的支持
-            r'\(\s*select\s+.*?\s+from\s+([\w.]+)',  # 支持 SELECT 子查询
-            r',\s*([\w.]+)'  # 支持多个表名的情况
-        ]
-
-        for pattern in patterns:
-            match = re.search(pattern, sql, re.I)
-            if match:
-                return match.group(1)
-                
-        return sql
-
-    @property
-    def split_withsqls(self):
-        sql = self.sql
-        if not sql.lower().startswith('with'):
-            raise Exception(f"Sql should startswith [with], but startswith [{sql[:4]}] !!!")
-
-        sqls = re.split(r'(?<=\)), *\n+.*?\n*(?=.*?as *\n)', sql)
-        if sqls[-1].startswith('select'):
-            sql_last = sqls[-2] + sqls[-1]
-            sqls = sqls[:-2] + [sql_last]
-        return sqls
-
-    @property
-    def combination_sqls(self):
-        combination_sqls = []
-        sqls = self.split_withsqls
-        for idx, sql in enumerate(sqls):
-            tablename = re.search(r'(?:with )?(.*?)(?: as)', sql)
-            tablename = tablename.group(1) if tablename else ''
-
-            # 生成注释内容和SELECT语句
-            content = f"-- {tablename}_{idx + 1:03d}"
-            sql_select = f'select * from {tablename} limit 10' if idx + 1 < len(sqls) else 'limit 10'
-
-            # 组合前面的SQL
-            combined_sql = ',\n'.join(sqls[:idx+1])
-            combined_sql = f'{content}\n{combined_sql}\n{sql_select}'
-
-            combination_sqls.append(combined_sql)
-        return combination_sqls
-
-    @property
-    def parameters(self):
-        sql = self.sql
-        parameters = re.findall(r"\$(\w+)", sql)
-        return set(parameters)
-
-    def substitute_parameters(self, **kwargs):
-        '''[summary]
-
-        [description]
-            替换具体的参数值，传入的参数值会覆盖文件中设置的参数值
-        Arguments:
-            **kwargs {[参数]} -- [传入的参数值]
-
-        Returns:
-            [str] -- [替换过后的内容]
-
-        '''
-        params_diff = set(self.parameters) - set(kwargs)
-        if params_diff:
-            missing_params = ', '.join(params_diff)
-            raise Exception(f"Missing parameters: {missing_params}. Please provide values for all parameters.")
-
-        sql = self.sql
-        for key, value in kwargs.items():
-            sql = re.sub(rf"\${key}", f"{value}", sql)
-
-        return sql
-
-
-class SqlFileParse(object):
-
-    def __init__(self, filepath):
-        self.filepath = filepath
-
-    def get_content(self):
-        if not os.path.isfile(self.filepath):
-            raise Exception(f'File 【{self.filepath}】 not exists !')
-
-        with open(self.filepath, 'r', encoding='utf-8') as f:
-            content = f.read()
-        return content
-
-    def parse_argument(self, argument: str, arguments: Dict[str, Any]) -> Tuple[str, Any]:
-        key, value = argument.split('=', 1)
-        key, value = key.strip(), value.strip()
-        try:
-            globals_value = {'timedelta': timedelta}
-            value = eval(value, globals_value, arguments)
-        except NameError as e:
-            raise NameError(f"{e}, please set it before '{key}' !!!")
-        return key, value
-
-    def get_arguments_infile(self, content: str):
-        '''[summary]
-
-        [description]
-            获取文件中配置的arguments
-        Returns:
-            [dict] -- [返回文件中的参数设置]
-        '''
-        arguments = {
-            'today': date.today(),
-            'now': datetime.now(),
-        }
-        arguments_infile = re.findall(r'(?<!--)\s*#【arguments】#\s*\n(.*?)#【arguments】#', content, re.S)
-        arguments_infile = ';'.join(arguments_infile).replace('\n', ';')
-        arguments_infile = [argument.strip() for argument in arguments_infile.split(';') if argument]
-        for argument in arguments_infile:
-            if argument.startswith('--'):
-                continue
-
-            key, value = self.parse_argument(argument, arguments)
-            arguments[key] = value
-
-        arguments = {k: f"'{datetime.strftime(v, '%Y-%m-%d %H:%M:%S')}'" if isinstance(v, datetime)
-                        else f"'{datetime.strftime(v, '%Y-%m-%d')}'" if isinstance(v, date)
-                        else v for k, v in arguments.items()}  # 处理时间
-        # print(arguments)
-        return arguments
-
-    def get_sqls_infile(self, content: str):
-        sqls = re.findall(r'(?<!--)\s*###\s*\n(.*?)###', content, re.S)
-        return sqls
-
-    def parse_file(self):
-        content = self.get_content()
-        arguments = self.get_arguments_infile(content)
-        sqls = self.get_sqls_infile(content)
-        return arguments, sqls
-
-    def update_arguments(self, arguments_infile: Dict[str, Any], **kwargs: Dict[str, Any]) -> Dict[str, Any]:
-        '''[summary]
-
-        [description]
-            替换具体的参数值，传入的参数值会覆盖文件中设置的参数值
-        Arguments:
-            **kwargs {[参数]} -- [传入的参数值]
-
-        Returns:
-            [str] -- [替换过后的内容]
-
-        '''
-        # 获取文件名
-        filename = os.path.basename(self.filepath)
-        
-        # 过滤掉值为空的参数
-        kwargs = {k: v for k, v in kwargs.items() if v}
-        # 组合文件参数和传入参数
-        arguments_final = {**arguments_infile, **kwargs}
-
-        # 记录最终参数的日志
-        if arguments_final:
-            arglog = f"【Final Arguments】【{filename}】 Use arguments {arguments_final}"
-        else:
-            arglog = f"【Final Arguments】【{filename}】 no arguments !!!"
-
-        # 计算文件参数和传入参数的交集，并记录日志
-        arguments_same = set(arguments_infile) & set(kwargs)
-        if arguments_same:
-            arguments_same = sorted(arguments_same)
-            file_arg = {arg: arguments_infile.get(arg) for arg in arguments_same}
-            argsamelog = f"Replace FileSetting {file_arg}"
-            arglog = f"{arglog}, {argsamelog}"
-        
-        sqllogger.warning(arglog)
-
-        return arguments_final
-
-    def get_filesqls(self, with_test: bool = False, with_snum: int = 0, **kwargs: Any) -> Tuple[Dict[str, Any], Dict[str, str]]:
-        fsqls = {}
-        content = self.get_content()
-        arguments_infile = self.get_arguments_infile(content)
-        farguments = self.update_arguments(arguments_infile, **kwargs)
-        sqls = self.get_sqls_infile(content)
-
-        for idx, sql in enumerate(sqls):
-            sqlparser = SqlParse(sql)
-            purpose = f"【{idx + 1:0>3d}】{sqlparser.purpose}"
-            sql = sqlparser.substitute_parameters(**farguments)
-
-            if with_test:
-                combination_sqls = sqlparser.combination_sqls
-                fsqls[f"{purpose}_{with_snum:03d}"] = combination_sqls[with_snum-1]
-            else:
-                fsqls[purpose] = sql
-
-        return farguments, fsqls
+# -*- coding: utf-8 -*-
+# @Author: longfengpili
+# @Date:   2024-10-09 16:33:05
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2024-10-12 10:12:45
+# @github: https://github.com/longfengpili
+
+
+import re
+
+import sqlparse
+from sqlparse.sql import Statement, Token, TokenList, Identifier, IdentifierList, Comment
+from sqlparse.tokens import DML, DDL, CTE
+from sqlparse.tokens import Keyword, Newline, Punctuation
+
+import logging
+sqllogger = logging.getLogger(__name__)
+
+
+class SqlParse:
+
+    def __init__(self, orisql: str):
+        self.orisql = orisql
+        self.verbose = 1
+
+    @property
+    def statements(self):
+        statements = sqlparse.parse(self.orisql)
+        if len(statements) > 1 and self.verbose:
+            self.verbose = 0
+            sqllogger.warning(f'SQL has {len(statements)} statements ~')
+        return statements
+
+    @property
+    def sql(self):
+        sql = sqlparse.format(self.orisql, keyword_case='lower', strip_comments=True, use_space_around_operators=True)
+        return sql
+
+    def get_statement(self, idx: int = 0):
+        statements = self.statements
+        stmt = statements[idx]
+        return stmt
+
+    def get_first_comment(self):
+        first_stmt = self.get_statement()
+        for token in first_stmt.tokens:
+            if token.ttype == Newline:
+                continue
+            elif isinstance(token, Comment):
+                first_comment = token.value
+                return first_comment
+            else:
+                break
+        return '--No purpose--No comment'
+
+    @property
+    def purpose(self):
+        first_comment = self.get_first_comment()
+        purpose = re.search(r'--(.*?)--.*?$', first_comment, re.S)
+        if purpose:
+            purpose = purpose.group(1).strip()
+        return purpose
+
+    @property
+    def comment(self):
+        first_comment = self.get_first_comment()
+        comment = re.search(r'(?:--.*?)?--(.*?)$', first_comment, re.S)
+        if comment:
+            comment = comment.group(1).strip()
+        return comment
+
+    @property
+    def action(self):
+        first_stmt = self.get_statement()
+        for token in first_stmt.tokens:
+            if token.ttype in (DML, DDL, CTE):
+                return token.value
+
+    def get_tables(self, tokenlist: [TokenList, Statement]):
+        tables = []
+        from_seen = True
+        # action = None
+        for token in tokenlist.tokens:
+            if from_seen and isinstance(token, Identifier):
+                tablename = token.value
+                if not re.match(r'([\w_]+\.)*\w+$', tablename):
+                    tablename = token.get_real_name()
+                # tablename = f'{tablename}({action})'
+                tables.append(tablename)
+            elif token.ttype in (DML, DDL, CTE):
+                # action = token.value
+                if token.value.lower() == 'select':
+                    from_seen = False
+            elif token.ttype is Keyword and token.value.lower() in ('from', 'join', 'into', 'update', 'delete'):
+                from_seen = True
+
+            # 暂时不考虑IdentifierList，后面再解决
+            # if isinstance(token, IdentifierList):
+            #     for identifier in token.get_identifiers():
+            #         tables.append(identifier.get_real_name())
+        return tables
+
+    @property
+    def tablename(self):
+        first_stmt = self.get_statement()
+        tables = self.get_tables(first_stmt)
+        if tables:
+            return tables[0]
+
+    def get_subqueries(self, tokens: list, subtokens: list[Token] = None, subqueries: list[list[Token, ]] = None, keep_last: bool = True):
+        def append_subquery(subtokens: list, subqueries: list):
+            subtokens = TokenList(subtokens)
+            subtoken_first = subtokens.token_first(skip_cm=True)
+            if subtoken_first:
+                subqueries.append(subtokens)
+
+        if subqueries is None:
+            subqueries = []
+        if subtokens is None:
+            subtokens = []
+        islast = False
+
+        for token in tokens:
+            if isinstance(token, Comment):
+                continue
+            elif token.ttype in (DML, DDL, CTE):
+                append_subquery(subtokens, subqueries)
+                if token.value.lower() == 'select':
+                    islast = True
+                subtokens = [token]
+            elif token.ttype == Punctuation and not islast:
+                append_subquery(subtokens, subqueries)
+                subtokens = []
+            elif isinstance(token, Identifier):  # Identifier 也是 TokenList, 所有必须在下个判断之前
+                subtokens.append(token)
+            elif isinstance(token, TokenList) or isinstance(token, IdentifierList):
+                self.get_subqueries(token.tokens, subtokens, subqueries)
+            else:
+                subtokens.append(token)
+
+        if keep_last:
+            append_subquery(subtokens, subqueries)
+
+        return subqueries
+
+    @property
+    def combination_sqls(self):
+        combination_sqls = []
+        first_stmt = self.get_statement()
+        subqueries = self.get_subqueries(first_stmt.tokens, keep_last=False)
+        for idx, tokenlist in enumerate(subqueries):
+            tables = self.get_tables(tokenlist)
+            tablename = tables[0] if tables else ''
+
+            # 生成注释内容和SELECT语句
+            content = f"-- {tablename}_{idx + 1:03d}"
+            sql_select = f'select * from {tablename} limit 10'
+
+            # 组合前面的SQL
+            combined_sql = ',\n'.join([subquery.value for subquery in subqueries[:idx+1]])
+            combined_sql = f'{content}\n{combined_sql}\n{sql_select}'
+
+            combination_sqls.append(combined_sql)
+        return combination_sqls
+
+    @property
+    def parameters(self):
+        sql = self.sql
+        parameters = re.findall(r"\$(\w+)", sql)
+        return set(parameters)
+
+    def substitute_parameters(self, **kwargs):
+        '''[summary]
+
+        [description]
+            替换具体的参数值，传入的参数值会覆盖文件中设置的参数值
+        Arguments:
+            **kwargs {[参数]} -- [传入的参数值]
+
+        Returns:
+            [str] -- [替换过后的内容]
+
+        '''
+        params_diff = set(self.parameters) - set(kwargs)
+        if params_diff:
+            missing_params = ', '.join(params_diff)
+            raise Exception(f"Missing parameters: {missing_params}. Please provide values for all parameters.")
+
+        sql = self.sql
+        for key, value in kwargs.items():
+            sql = re.sub(rf"\${key}", f"{value}", sql)
+
+        return sql
diff --git a/pydbapi/sql/parse_old.py b/pydbapi/sql/parse_old.py
new file mode 100644
index 0000000..5da2fad
--- /dev/null
+++ b/pydbapi/sql/parse_old.py
@@ -0,0 +1,264 @@
+# -*- coding: utf-8 -*-
+# @Author: longfengpili
+# @Date:   2023-06-02 15:27:41
+# @Last Modified by:   longfengpili
+# @Last Modified time: 2024-09-29 11:45:27
+# @github: https://github.com/longfengpili
+
+
+import re
+import os
+from datetime import datetime, date, timedelta
+from typing import Any, Dict, List, Tuple
+
+import logging
+sqllogger = logging.getLogger(__name__)
+
+
+class SqlParse(object):
+
+    def __init__(self, orisql):
+        self.orisql = orisql
+
+    @property
+    def purpose(self):
+        purpose = re.match('-- *(【.*?】)\n', self.orisql.strip())
+        purpose = f"{purpose.group(1)}" if purpose else 'No Description'
+        return purpose
+
+    @property
+    def sql(self):
+        sql = re.sub('^--.*?\n', '\n', self.orisql.strip() + '\n')
+        sql = re.sub('--.*?\n', '\n', sql)  # 去掉注释
+        return sql.strip().rstrip(';')
+
+    @staticmethod
+    def split_sqls(sql):
+        sql = sql.strip()
+        sql = sql if sql.endswith(';') else sql + ';'
+        sql_r1 = re.sub('; *\n', ';\n', sql)  # 处理多余的；
+        sql_r2 = re.sub(';$', ';\n', sql_r1)  # 末尾增加'\n'
+        sqls = re.split(';\n', sql_r2)[:-1]
+        return sqls
+
+    @property
+    def comment(self):
+        orisql = self.orisql.strip()
+        orisql = orisql if orisql.endswith(';') else orisql + ';'
+        comment = re.search('^-- *(.*?)\n', orisql)
+        comment = comment.group(1).strip() if comment else ''
+        return comment
+
+    @property
+    def action(self):
+        if not self.sql:
+            return 'NoSql'
+
+        sql = self.sql.replace('\n', '')
+        splits = sql.split(' ')
+        action = splits[0]
+        if splits[1].lower() == 'index':
+            action += splits[1]
+        return action.upper()
+
+    @property
+    def tablename(self):
+        sql = self.sql
+        patterns = [
+            r'create (?:temp |temporary )?table (?:if not exists |if exists )?([\w.]+)',
+            r'update\s+([\w.]+)',
+            r'delete\s+(?:from\s+)?([\w.]+)',
+            r'insert\s+into\s+([\w.]+)',
+            r'from\s+([\w.]+)',
+            r'on\s+([\w.]+)',
+            r'join\s+([\w.]+)',  # 增加对 JOIN 语句的支持
+            r'\(\s*select\s+.*?\s+from\s+([\w.]+)',  # 支持 SELECT 子查询
+            r',\s*([\w.]+)'  # 支持多个表名的情况
+        ]
+
+        for pattern in patterns:
+            match = re.search(pattern, sql, re.I)
+            if match:
+                return match.group(1)
+                
+        return sql
+
+    @property
+    def split_withsqls(self):
+        sql = self.sql
+        if not sql.lower().startswith('with'):
+            raise Exception(f"Sql should startswith [with], but startswith [{sql[:4]}] !!!")
+
+        sqls = re.split(r'(?<=\)), *\n+.*?\n*(?=.*?as *\n)', sql)
+        if sqls[-1].startswith('select'):
+            sql_last = sqls[-2] + sqls[-1]
+            sqls = sqls[:-2] + [sql_last]
+        return sqls
+
+    @property
+    def combination_sqls(self):
+        combination_sqls = []
+        sqls = self.split_withsqls
+        for idx, sql in enumerate(sqls):
+            tablename = re.search(r'(?:with )?(.*?)(?: as)', sql)
+            tablename = tablename.group(1) if tablename else ''
+
+            # 生成注释内容和SELECT语句
+            content = f"-- {tablename}_{idx + 1:03d}"
+            sql_select = f'select * from {tablename} limit 10' if idx + 1 < len(sqls) else 'limit 10'
+
+            # 组合前面的SQL
+            combined_sql = ',\n'.join(sqls[:idx+1])
+            combined_sql = f'{content}\n{combined_sql}\n{sql_select}'
+
+            combination_sqls.append(combined_sql)
+        return combination_sqls
+
+    @property
+    def parameters(self):
+        sql = self.sql
+        parameters = re.findall(r"\$(\w+)", sql)
+        return set(parameters)
+
+    def substitute_parameters(self, **kwargs):
+        '''[summary]
+
+        [description]
+            替换具体的参数值，传入的参数值会覆盖文件中设置的参数值
+        Arguments:
+            **kwargs {[参数]} -- [传入的参数值]
+
+        Returns:
+            [str] -- [替换过后的内容]
+
+        '''
+        params_diff = set(self.parameters) - set(kwargs)
+        if params_diff:
+            missing_params = ', '.join(params_diff)
+            raise Exception(f"Missing parameters: {missing_params}. Please provide values for all parameters.")
+
+        sql = self.sql
+        for key, value in kwargs.items():
+            sql = re.sub(rf"\${key}", f"{value}", sql)
+
+        return sql
+
+
+class SqlFileParse(object):
+
+    def __init__(self, filepath):
+        self.filepath = filepath
+
+    def get_content(self):
+        if not os.path.isfile(self.filepath):
+            raise Exception(f'File 【{self.filepath}】 not exists !')
+
+        with open(self.filepath, 'r', encoding='utf-8') as f:
+            content = f.read()
+        return content
+
+    def parse_argument(self, argument: str, arguments: Dict[str, Any]) -> Tuple[str, Any]:
+        key, value = argument.split('=', 1)
+        key, value = key.strip(), value.strip()
+        try:
+            globals_value = {'timedelta': timedelta}
+            value = eval(value, globals_value, arguments)
+        except NameError as e:
+            raise NameError(f"{e}, please set it before '{key}' !!!")
+        return key, value
+
+    def get_arguments_infile(self, content: str):
+        '''[summary]
+
+        [description]
+            获取文件中配置的arguments
+        Returns:
+            [dict] -- [返回文件中的参数设置]
+        '''
+        arguments = {
+            'today': date.today(),
+            'now': datetime.now(),
+        }
+        arguments_infile = re.findall(r'(?<!--)\s*#【arguments】#\s*\n(.*?)#【arguments】#', content, re.S)
+        arguments_infile = ';'.join(arguments_infile).replace('\n', ';')
+        arguments_infile = [argument.strip() for argument in arguments_infile.split(';') if argument]
+        for argument in arguments_infile:
+            if argument.startswith('--'):
+                continue
+
+            key, value = self.parse_argument(argument, arguments)
+            arguments[key] = value
+
+        arguments = {k: f"'{datetime.strftime(v, '%Y-%m-%d %H:%M:%S')}'" if isinstance(v, datetime)
+                        else f"'{datetime.strftime(v, '%Y-%m-%d')}'" if isinstance(v, date)
+                        else v for k, v in arguments.items()}  # 处理时间
+        # print(arguments)
+        return arguments
+
+    def get_sqls_infile(self, content: str):
+        sqls = re.findall(r'(?<!--)\s*###\s*\n(.*?)###', content, re.S)
+        return sqls
+
+    def parse_file(self):
+        content = self.get_content()
+        arguments = self.get_arguments_infile(content)
+        sqls = self.get_sqls_infile(content)
+        return arguments, sqls
+
+    def update_arguments(self, arguments_infile: Dict[str, Any], **kwargs: Dict[str, Any]) -> Dict[str, Any]:
+        '''[summary]
+
+        [description]
+            替换具体的参数值，传入的参数值会覆盖文件中设置的参数值
+        Arguments:
+            **kwargs {[参数]} -- [传入的参数值]
+
+        Returns:
+            [str] -- [替换过后的内容]
+
+        '''
+        # 获取文件名
+        filename = os.path.basename(self.filepath)
+        
+        # 过滤掉值为空的参数
+        kwargs = {k: v for k, v in kwargs.items() if v}
+        # 组合文件参数和传入参数
+        arguments_final = {**arguments_infile, **kwargs}
+
+        # 记录最终参数的日志
+        if arguments_final:
+            arglog = f"【Final Arguments】【{filename}】 Use arguments {arguments_final}"
+        else:
+            arglog = f"【Final Arguments】【{filename}】 no arguments !!!"
+
+        # 计算文件参数和传入参数的交集，并记录日志
+        arguments_same = set(arguments_infile) & set(kwargs)
+        if arguments_same:
+            arguments_same = sorted(arguments_same)
+            file_arg = {arg: arguments_infile.get(arg) for arg in arguments_same}
+            argsamelog = f"Replace FileSetting {file_arg}"
+            arglog = f"{arglog}, {argsamelog}"
+        
+        sqllogger.warning(arglog)
+
+        return arguments_final
+
+    def get_filesqls(self, with_test: bool = False, with_snum: int = 0, **kwargs: Any) -> Tuple[Dict[str, Any], Dict[str, str]]:
+        fsqls = {}
+        content = self.get_content()
+        arguments_infile = self.get_arguments_infile(content)
+        farguments = self.update_arguments(arguments_infile, **kwargs)
+        sqls = self.get_sqls_infile(content)
+
+        for idx, sql in enumerate(sqls):
+            sqlparser = SqlParse(sql)
+            purpose = f"【{idx + 1:0>3d}】{sqlparser.purpose}"
+            sql = sqlparser.substitute_parameters(**farguments)
+
+            if with_test:
+                combination_sqls = sqlparser.combination_sqls
+                fsqls[f"{purpose}_{with_snum:03d}"] = combination_sqls[with_snum-1]
+            else:
+                fsqls[purpose] = sql
+
+        return farguments, fsqls
diff --git a/pydbapi/sql/parsenew.py b/pydbapi/sql/parsenew.py
deleted file mode 100644
index 7716a36..0000000
--- a/pydbapi/sql/parsenew.py
+++ /dev/null
@@ -1,183 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Author: longfengpili
-# @Date:   2024-10-09 16:33:05
-# @Last Modified by:   longfengpili
-# @Last Modified time: 2024-10-11 10:30:18
-# @github: https://github.com/longfengpili
-
-
-import re
-
-import sqlparse
-from sqlparse.sql import Statement, TokenList, Identifier, IdentifierList, Comment
-from sqlparse.tokens import DML, DDL, CTE
-from sqlparse.tokens import Keyword, Newline, Punctuation
-
-import logging
-sqllogger = logging.getLogger(__name__)
-
-
-class SqlParse:
-
-    def __init__(self, orisql: str):
-        self.orisql = orisql
-        self.verbose = 1
-
-    @property
-    def statements(self):
-        statements = sqlparse.parse(self.orisql)
-        if len(statements) > 1 and self.verbose:
-            self.verbose = 0
-            sqllogger.warning(f'SQL has {len(statements)} statements ~')
-        return statements
-
-    @property
-    def sql(self):
-        sql = sqlparse.format(self.orisql, keyword_case='lower', strip_comments=True, use_space_around_operators=True)
-        return sql
-
-    def get_statement(self, idx: int = 0):
-        statements = self.statements
-        stmt = statements[idx]
-        return stmt
-
-    def get_first_comment(self):
-        first_stmt = self.get_statement()
-        for token in first_stmt.tokens:
-            if token.ttype == Newline:
-                continue
-            elif isinstance(token, Comment):
-                first_comment = token.value
-                return first_comment
-            else:
-                break
-
-    @property
-    def purpose(self):
-        purpose = 'No Description'
-        first_comment = self.get_first_comment()
-        purpose = re.search(r'--(.*?)\n', first_comment)
-        if purpose:
-            purpose = purpose.group(1).strip()
-        return purpose
-
-    @property
-    def comment(self):
-        comment = 'No Description'
-        first_comment = self.get_first_comment()
-        comment = re.search(r'--.*?--(.*?)$', first_comment, re.S)
-        if comment:
-            comment = comment.group(1).strip()
-        return comment
-
-    @property
-    def action(self):
-        first_stmt = self.get_statement()
-        for token in first_stmt.tokens:
-            if token.ttype in (DML, DDL, CTE):
-                return token.value
-
-    def get_tables(self, tokenlist: [TokenList, Statement]):
-        tables = []
-        from_seen = True
-        for token in tokenlist.tokens:
-            if from_seen and isinstance(token, Identifier):
-                tablename = token.value
-                if not re.match(r'([\w_]+\.)*\w+$', tablename):
-                    tablename = token.get_real_name()
-                tables.append(tablename)
-            if token.ttype == DML and token.value.lower() == 'select':
-                from_seen = False
-            if token.ttype is Keyword and token.value.lower() in ('from', 'join', 'into', 'update', 'delete'):
-                from_seen = True
-
-            # 暂时不考虑IdentifierList，后面再解决
-            # if isinstance(token, IdentifierList):
-            #     for identifier in token.get_identifiers():
-            #         tables.append(identifier.get_real_name())
-        return tables
-
-    @property
-    def tablename(self):
-        first_stmt = self.get_statement()
-        tables = self.get_tables(first_stmt)
-        return tables[0]
-
-    def get_subqueries(self, keep_last: bool = True):
-        def append_subquery(subtokens: list, subqueries: list):
-            subtokens = TokenList(subtokens)
-            subtoken_first = subtokens.token_first(skip_cm=True)
-            if subtoken_first:
-                subqueries.append(subtokens)
-
-        subqueries = []
-        subtokens = []
-        islast = False
-
-        first_stmt = self.get_statement()
-        for token in first_stmt.tokens:
-            if isinstance(token, Comment):
-                continue
-            elif token.ttype in (DML, DDL, CTE):
-                append_subquery(subtokens, subqueries)
-                if token.value.lower() == 'select':
-                    islast = True
-                subtokens = [token]
-            elif token.ttype == Punctuation and not islast:
-                append_subquery(subtokens, subqueries)
-                subtokens = []
-            else:
-                subtokens.append(token)
-
-        if keep_last:
-            append_subquery(subtokens, subqueries)
-
-        return subqueries
-
-    @property
-    def combination_sqls(self):
-        combination_sqls = []
-        subqueries = self.get_subqueries(keep_last=False)
-        for idx, tokenlist in enumerate(subqueries):
-            tables = self.get_tables(tokenlist)
-            tablename = tables[0]
-
-            # 生成注释内容和SELECT语句
-            content = f"-- {tablename}_{idx + 1:03d}"
-            sql_select = f'select * from {tablename} limit 10'
-
-            # 组合前面的SQL
-            combined_sql = ',\n'.join([subquery.value for subquery in subqueries[:idx+1]])
-            combined_sql = f'{content}\n{combined_sql}\n{sql_select}'
-
-            combination_sqls.append(combined_sql)
-        return combination_sqls
-
-    @property
-    def parameters(self):
-        sql = self.sql
-        parameters = re.findall(r"\$(\w+)", sql)
-        return set(parameters)
-
-    def substitute_parameters(self, **kwargs):
-        '''[summary]
-
-        [description]
-            替换具体的参数值，传入的参数值会覆盖文件中设置的参数值
-        Arguments:
-            **kwargs {[参数]} -- [传入的参数值]
-
-        Returns:
-            [str] -- [替换过后的内容]
-
-        '''
-        params_diff = set(self.parameters) - set(kwargs)
-        if params_diff:
-            missing_params = ', '.join(params_diff)
-            raise Exception(f"Missing parameters: {missing_params}. Please provide values for all parameters.")
-
-        sql = self.sql
-        for key, value in kwargs.items():
-            sql = re.sub(rf"\${key}", f"{value}", sql)
-
-        return sql
diff --git a/setup.py b/setup.py
index 880323b..5fc0b1f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 # @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
 # @Last Modified by:   longfengpili
-# @Last Modified time: 2024-09-29 11:45:45
+# @Last Modified time: 2024-10-12 11:27:51
 # @github: https://github.com/longfengpili
 
 
@@ -11,7 +11,7 @@
 from pathlib import Path
 from setuptools.command.install import install
 
-VERSION = '0.0.134'
+VERSION = '0.0.135'
 PROJECT_NAME = 'pydbapi'
 
 with open('README.md', 'r', encoding='utf-8') as f:
diff --git a/tests/trino/test_trino.py b/tests/trino/test_trino.py
index 0d7e431..a61c331 100644
--- a/tests/trino/test_trino.py
+++ b/tests/trino/test_trino.py
@@ -2,7 +2,7 @@
 # @Author: longfengpili
 # @Date:   2023-06-02 15:27:41
 # @Last Modified by:   longfengpili
-# @Last Modified time: 2024-07-09 13:56:44
+# @Last Modified time: 2024-10-12 10:57:16
 # @github: https://github.com/longfengpili
 
 
@@ -35,10 +35,12 @@ def setup_method(self, method):
     def teardown_method(self, method):
         pass
 
+    @pytest.mark.drop
     def test_get_instance(self):
         print(self.trinodb)
         print(dir(self.trinodb))
 
+    @pytest.mark.drop
     def test_create_for_drop(self):
         tablename = f"{self.tablename}_for_drop"
         rows, action, result = self.trinodb.create(tablename, self.columns, partition='birthday')