feat: sql脚本执行调整

server/internal/db/api/db.go

@@ -9,6 +9,7 @@ import (
 	"mayfly-go/internal/db/application/dto"
 	"mayfly-go/internal/db/config"
 	"mayfly-go/internal/db/dbm/dbi"
+	"mayfly-go/internal/db/dbm/sqlparser"
 	"mayfly-go/internal/db/domain/entity"
 	"mayfly-go/internal/event"
 	msgapp "mayfly-go/internal/msg/application"
@@ -28,7 +29,6 @@ import (
 	"strings"
 	"time"
 
-	// "github.com/kanzihuang/vitess/go/vt/sqlparser"
 	"github.com/may-fly/cast"
 )
 
@@ -110,8 +110,6 @@ func (d *Db) ExecSql(rc *req.Ctx) {
 	global.EventBus.Publish(rc.MetaCtx, event.EventTopicResourceOp, dbConn.Info.CodePath[0])
 	sqlStr, err := cryptox.AesDecryptByLa(form.Sql, rc.GetLoginAccount())
 	biz.ErrIsNilAppendErr(err, "sql解码失败: %s")
-	// 去除前后空格及换行符
-	// sql := stringx.TrimSpaceAndBr(sqlStr)
 
 	rc.ReqParam = fmt.Sprintf("%s %s\n-> %s", dbConn.Info.GetLogDesc(), form.ExecId, sqlStr)
 	biz.NotEmpty(form.Sql, "sql不能为空")
@@ -131,38 +129,6 @@ func (d *Db) ExecSql(rc *req.Ctx) {
 	execRes, err := d.DbSqlExecApp.Exec(ctx, execReq)
 	biz.ErrIsNil(err)
 	rc.ResData = execRes
-
-	// sqls := strings.Split(sql, ";")
-	// sqls = collx.ArrayRemoveBlank(sqls)
-	// // sqls, err := sqlparser.SplitStatementToPieces(sql, sqlparser.WithDialect(dbConn.GetMetaData().GetSqlParserDialect()))
-	// biz.ErrIsNil(err, "SQL解析错误,请检查您的执行SQL")
-	// isMulti := len(sqls) > 1
-	// var execResAll *application.DbSqlExecRes
-
-	// for _, s := range sqls {
-	// 	s = stringx.TrimSpaceAndBr(s)
-	// 	// 多条执行，暂不支持查询语句
-	// 	if isMulti && len(s) > 10 {
-	// 		biz.IsTrue(!strings.HasPrefix(strings.ToLower(s[:10]), "select"), "多条语句执行暂不不支持select语句")
-	// 	}
-
-	// 	execReq.Sql = s
-	// 	execRes, err := d.DbSqlExecApp.Exec(ctx, execReq)
-	// 	biz.ErrIsNilAppendErr(err, fmt.Sprintf("[%s] -> 执行失败: ", s)+"%s")
-
-	// 	if execResAll == nil {
-	// 		execResAll = execRes
-	// 	} else {
-	// 		execResAll.Merge(execRes)
-	// 	}
-	// }
-
-	// colAndRes := make(map[string]any)
-	// if execResAll != nil {
-	// 	colAndRes["columns"] = execResAll.Columns
-	// 	colAndRes["res"] = execResAll.Res
-	// }
-	// rc.ResData = colAndRes
 }
 
 // progressCategory sql文件执行进度消息类型
@@ -203,19 +169,6 @@ func (d *Db) ExecSqlFile(rc *req.Ctx) {
 		}
 	}()
 
-	execReq := &application.DbSqlExecReq{
-		DbId:      dbId,
-		Db:        dbName,
-		Remark:    filename,
-		DbConn:    dbConn,
-		CheckFlow: true,
-	}
-
-	var sql string
-
-	// tokenizer := sqlparser.NewReaderTokenizer(file,
-	// 	sqlparser.WithCacheInBuffer(), sqlparser.WithDialect(dbConn.GetMetaData().GetSqlParserDialect()))
-
 	executedStatements := 0
 	progressId := stringx.Rand(32)
 	laId := rc.GetLoginAccount().Id
@@ -227,7 +180,8 @@ func (d *Db) ExecSqlFile(rc *req.Ctx) {
 	}).WithCategory(progressCategory))
 	ticker := time.NewTicker(time.Second * 1)
 	defer ticker.Stop()
-	for {
+
+	err = sqlparser.SQLSplit(file, func(sql string) error {
 		select {
 		case <-ticker.C:
 			ws.SendJsonMsg(ws.UserId(laId), clientId, msgdto.InfoSysMsg("sql脚本执行进度", &progressMsg{
@@ -238,41 +192,13 @@ func (d *Db) ExecSqlFile(rc *req.Ctx) {
 			}).WithCategory(progressCategory))
 		default:
 		}
+
 		executedStatements++
-		// sql, err = sqlparser.SplitNext(tokenizer)
-		// if err == io.EOF {
-		// 	break
-		// }
-		biz.ErrIsNilAppendErr(err, "%s")
+		_, err = dbConn.Exec(sql)
+		return err
+	})
 
-		const prefixUse = "use "
-		const prefixUSE = "USE "
-		if strings.HasPrefix(sql, prefixUSE) || strings.HasPrefix(sql, prefixUse) {
-			// var stmt sqlparser.Statement
-			// stmt, err = sqlparser.Parse(sql)
-			biz.ErrIsNilAppendErr(err, "%s")
-
-			// stmtUse, ok := stmt.(*sqlparser.Use)
-			// 最终执行结果以数据库直接结果为准
-			// if !ok {
-			// 	logx.Warnf("sql解析失败: %s", sql)
-			// }
-			// dbConn, err = d.DbApp.GetDbConn(dbId, stmtUse.DBName.String())
-			biz.ErrIsNil(err)
-			biz.ErrIsNilAppendErr(d.TagApp.CanAccess(laId, dbConn.Info.CodePath...), "%s")
-			execReq.DbConn = dbConn
-		}
-		// 需要记录执行记录
-		const maxRecordStatements = 64
-		if executedStatements < maxRecordStatements {
-			execReq.Sql = sql
-			_, err = d.DbSqlExecApp.Exec(rc.MetaCtx, execReq)
-		} else {
-			_, err = dbConn.Exec(sql)
-		}
-
-		biz.ErrIsNilAppendErr(err, "%s")
-	}
+	biz.ErrIsNilAppendErr(err, "%s")
 	d.MsgApp.CreateAndSend(rc.GetLoginAccount(), msgdto.SuccessSysMsg("sql脚本执行成功", fmt.Sprintf("sql脚本执行完成：%s", rc.ReqParam)).WithClientId(clientId))
 }
 

server/internal/db/application/db_sql_exec.go

@@ -89,14 +89,12 @@ func (d *dbSqlExecAppImpl) Exec(ctx context.Context, execSqlReq *DbSqlExecReq) (
 	allExecRes := make([]*DbSqlExecRes, 0)
 
 	stmts, err := sp.Parse(execSql)
-	// sql解析失败，则直接使用;切割进行执行
+	// sql解析失败，则使用默认方式切割
 	if err != nil {
-		sqlScan := sqlparser.SplitSqls(strings.NewReader(execSql))
-		for sqlScan.Scan() {
+		sqlparser.SQLSplit(strings.NewReader(execSql), func(oneSql string) error {
 			var execRes *DbSqlExecRes
 			var err error
 
-			oneSql := sqlScan.Text()
 			dbSqlExecRecord := createSqlExecRecord(ctx, execSqlReq, oneSql)
 			dbSqlExecRecord.Type = entity.DbSqlExecTypeOther
 			sqlExec := &sqlExecParam{DbConn: dbConn, Sql: oneSql, Procdef: flowProcdef, SqlExecRecord: dbSqlExecRecord}
@@ -124,8 +122,8 @@ func (d *dbSqlExecAppImpl) Exec(ctx context.Context, execSqlReq *DbSqlExecReq) (
 				d.saveSqlExecLog(dbSqlExecRecord, dbSqlExecRecord.Res)
 			}
 			allExecRes = append(allExecRes, execRes)
-		}
-
+			return nil
+		})
 		return allExecRes, nil
 	}
 

server/internal/db/dbm/sqlparser/sqlparser.go

@@ -2,18 +2,15 @@ package sqlparser
 
 import (
 	"bufio"
+	"bytes"
 	"io"
 	"mayfly-go/internal/db/dbm/sqlparser/sqlstmt"
-	"regexp"
+	"strings"
+	"unicode/utf8"
 )
 
 type DbDialect string
 
-// const (
-// 	mysql DbDialect = "mysql"
-// 	pgsql DbDialect = "pgsql"
-// )
-
 type SqlParser interface {
 
 	// sql解析
@@ -21,63 +18,102 @@ type SqlParser interface {
 	Parse(stmt string) ([]sqlstmt.Stmt, error)
 }
 
-// var (
-// 	parsers = make(map[string]SqlParser)
-// )
-
-// // 注册数据库类型与dbmeta
-// func Register(dialect string, parser SqlParser) {
-// 	parsers[dialect] = parser
-// }
-
-// func getParser(dialect string) (SqlParser, error) {
-// 	parser, ok := parsers[dialect]
-// 	if !ok {
-// 		return nil, errors.New("不存在该parser")
-// 	}
-// 	return parser, nil
-// }
-
-// 解析sql
-// @param dialect 方言
-// @param stmt sql语句
-// func Parse(dialect string, stmt string) ([]sqlstmt.Stmt, error) {
-// 	if parser, err := getParser(dialect); err != nil {
-// 		return nil, err
-// 	} else {
-// 		return parser.Parse(stmt)
-// 	}
-// }
-
-var sqlSplitRegexp = regexp.MustCompile(`\s*;\s*\n`)
-
-// SplitSqls 根据;\n切割sql
-func SplitSqls(r io.Reader) *bufio.Scanner {
-	scanner := bufio.NewScanner(r)
-
-	scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
-		if atEOF && len(data) == 0 {
-			return 0, nil, io.EOF
-		}
-
-		match := sqlSplitRegexp.FindIndex(data)
-
-		if match != nil {
-			// 如果找到了";\n"，判断是否为最后一行
-			if match[1] == len(data) {
-				// 如果是最后一行，则返回完整的切片
-				return len(data), data, nil
-			}
-			// 否则，返回到";\n"之后，并且包括";\n"本身
-			return match[1], data[:match[1]], nil
-		}
-
-		if atEOF {
-			return len(data), data, nil
-		}
-
-		return 0, nil, nil
-	})
-
-	return scanner
+// SQLSplit sql切割
+func SQLSplit(r io.Reader, callback SQLCallback) error {
+	return parseSQL(r, callback)
+}
+
+// SQLCallback 是解析出一条 SQL 语句后的回调函数
+type SQLCallback func(sql string) error
+
+func parseSQL(r io.Reader, callback SQLCallback) error {
+	reader := bufio.NewReaderSize(r, 512*1024)
+	buffer := new(bytes.Buffer) // 使用 bytes.Buffer 来处理数据
+	var currentStatement bytes.Buffer
+	var inString bool
+	var inMultiLineComment bool
+	var inSingleLineComment bool
+	var stringDelimiter rune
+
+	for {
+		// 读取数据到缓冲区
+		data, err := reader.ReadBytes('\n') // 按行读取
+		if err == io.EOF && len(data) == 0 {
+			break
+		}
+		if err != nil && err != io.EOF {
+			return err
+		}
+		buffer.Write(data)
+
+		// 处理缓冲区中的数据
+		for buffer.Len() > 0 {
+			r, size := utf8.DecodeRune(buffer.Bytes())
+			if r == utf8.RuneError && size == 1 {
+				// 如果解码出错，说明数据不完整，继续读取更多数据
+				break
+			}
+
+			switch {
+			case inMultiLineComment:
+				if r == '*' && buffer.Len() >= 2 && buffer.Bytes()[1] == '/' {
+					inMultiLineComment = false
+					buffer.Next(2) // 跳过 '*/'
+				} else {
+					buffer.Next(size)
+				}
+			case inSingleLineComment:
+				if r == '\n' {
+					inSingleLineComment = false
+				}
+				buffer.Next(size)
+			case inString:
+				if r == stringDelimiter {
+					inString = false
+				}
+				currentStatement.WriteRune(r)
+				buffer.Next(size)
+			case r == '/' && buffer.Len() >= 2 && buffer.Bytes()[1] == '*':
+				inMultiLineComment = true
+				buffer.Next(2) // 跳过 '/*'
+			case r == '-' && buffer.Len() >= 2 && buffer.Bytes()[1] == '-':
+				inSingleLineComment = true
+				buffer.Next(2) // 跳过 '--'
+			case r == '\'' || r == '"':
+				inString = true
+				stringDelimiter = r
+				currentStatement.WriteRune(r)
+				buffer.Next(size)
+			case r == ';' && !inString && !inMultiLineComment && !inSingleLineComment:
+				sql := strings.TrimSpace(currentStatement.String())
+				if sql != "" {
+					if err := callback(sql); err != nil {
+						return err
+					}
+				}
+				currentStatement.Reset()
+				buffer.Next(size)
+			default:
+				currentStatement.WriteRune(r)
+				buffer.Next(size)
+			}
+		}
+
+		// 如果读取到 EOF 并且缓冲区为空，退出循环
+		if err == io.EOF && buffer.Len() == 0 {
+			break
+		}
+	}
+
+	// 处理最后剩余的缓冲区
+	if currentStatement.Len() > 0 {
+		sql := strings.TrimSpace(currentStatement.String())
+		if sql != "" {
+			if err := callback(sql); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
 }

server/internal/db/dbm/sqlparser/sqlparser_test.go

@@ -0,0 +1,38 @@
+package sqlparser
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+)
+
+func TestSQLSplit(t *testing.T) {
+
+	allsql := `
+	/*删除*/
+	DELETE FROM t_sys_log
+WHERE
+  id IN (59) and name='哈哈哈';delete form tsyslog;
+  -- alter sql语句
+  ALTER TABLE mayfly_go.t_sys_log
+DROP COLUMN delete_time;
+--插入sql语句
+  INSERT INTO t_sys_log VALUES(15, 2, '用户登录', '{"ip":"::1 ",\\n"username":"test_user"}', 'errCode: 401, errMsg: --您的密码安全等级较低，请修改后重新登录', '-', 0, '2024-04-23 20:00:35', 0, NULL, '');
+  --插入sql语句
+  INSERT INTO t_sys_log VALUES(15, 2, '用户登录', NULL, '⑴ 成孔；⑵ 砼浇筑；⑶ 桩头掏渣；⑷ 桩基检测配合;
+  ⑸ 其他工作；⑹ 甲方现场要求乙方完成的其它临时工作。', '{"ip":"::1 ","username":"test_user"}', 'errCode: 401, errMsg: 您的密码安全等级较低，请修改后重新登录;\n信息嘻嘻嘻', '-', 0, '2024-04-23 20:00:35', 0, NULL, '');
+  `
+	// fmt.Println(allsql)
+	// allsql2 := "select * from t_sys_log"
+	err := SQLSplit(strings.NewReader(allsql), func(sql string) error {
+		// if strings.Contains(sql, "INSERT") {
+		// 	return fmt.Errorf("不能存在INSERT语句")
+		// }
+		fmt.Println(sql)
+		fmt.Println()
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+}

server/internal/tag/domain/entity/tag_tree.go

@@ -140,7 +140,7 @@ func GetParentPath(codePath string, index int) string {
 	return parentPath + CodePathSeparator
 }
 
-// GetAllCodePath 根据表情路径获取所有相关的标签codePath
+// GetAllCodePath 根据标签路径获取所有相关的标签codePath，如 test1/test2/ -> test1/  test1/test2/
 func GetAllCodePath(codePath string) []string {
 	// 去除末尾的斜杠
 	codePath = strings.TrimSuffix(codePath, CodePathSeparator)