From ad616496d18a5acf6bc265e5f6dfe04f4274fd9e Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 2 Nov 2022 19:27:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=A4=9A=E6=9D=A1sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/ops/db/component/SqlExecDialog.vue  | 13 ++++--
 .../src/views/ops/mongo/MongoList.vue         |  2 +-
 server/internal/db/api/db.go                  | 42 +++++++++++++------
 server/internal/db/application/db.go          |  2 +-
 server/internal/db/application/db_sql_exec.go | 24 +++++++++--
 server/pkg/utils/str_utils.go                 |  8 ++++
 6 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue b/mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue
index 4d5053e0..da2c7ea0 100644
--- a/mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue
+++ b/mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue
@@ -1,7 +1,6 @@
 <template>
     <div>
         <el-dialog title="待执行SQL" v-model="dialogVisible" :show-close="false" width="600px">
-            如需执行多条sql，需要在【数据库管理】配置连接参数：multiStatements=true
             <codemirror height="350px" class="codesql" ref="cmEditor" language="sql" v-model="sqlValue"
                 :options="cmOptions" />
             <el-input ref="remarkInputRef" v-model="remark" placeholder="请输入执行备注" class="mt5" />
@@ -90,14 +89,22 @@ const runSql = async () => {
 
     try {
         state.btnLoading = true;
-        await dbApi.sqlExec.request({
+        const res = await dbApi.sqlExec.request({
             id: state.dbId,
             db: state.db,
             remark: state.remark,
             sql: state.sqlValue.trim(),
         });
-        ElMessage.success('执行成功');
+
+        for (let re of res.res) {
+            if (re.result !== 'success') {
+                ElMessage.error(`${re.sql} \n执行失败: ${re.result}`);
+                throw new Error(re.result)
+            }
+        }
+
         runSuccess = true;
+        ElMessage.success('执行成功');
     } catch (e) {
         runSuccess = false;
     }
diff --git a/mayfly_go_web/src/views/ops/mongo/MongoList.vue b/mayfly_go_web/src/views/ops/mongo/MongoList.vue
index 40fd2eae..78e81e67 100644
--- a/mayfly_go_web/src/views/ops/mongo/MongoList.vue
+++ b/mayfly_go_web/src/views/ops/mongo/MongoList.vue
@@ -36,7 +36,7 @@
 
                 <el-table-column label="操作" width>
                     <template #default="scope">
-                        <el-link type="primary" @click="showDatabases(scope.row.id, scope.row)" plain size="small"
+                        <el-link type="primary" @click="showDatabases(scope.row.id)" plain size="small"
                             :underline="false">数据库</el-link>
                     </template>
                 </el-table-column>
diff --git a/server/internal/db/api/db.go b/server/internal/db/api/db.go
index f73a40dd..f81edd6d 100644
--- a/server/internal/db/api/db.go
+++ b/server/internal/db/api/db.go
@@ -128,27 +128,43 @@ func (d *Db) ExecSql(rc *ctx.ReqCtx) {
 	dbInstance := d.DbApp.GetDbInstance(id, db)
 	biz.ErrIsNilAppendErr(d.TagApp.CanAccess(rc.LoginAccount.Id, dbInstance.TagPath), "%s")
 
+	rc.ReqParam = fmt.Sprintf("db: %d:%s | sql: %s", id, db, form.Sql)
+	biz.NotEmpty(form.Sql, "sql不能为空")
+
 	// 去除前后空格及换行符
-	sql := strings.TrimFunc(form.Sql, func(r rune) bool {
-		s := string(r)
-		return s == " " || s == "\n"
-	})
+	sql := utils.StrTrimSpaceAndBr(form.Sql)
 
-	rc.ReqParam = fmt.Sprintf("db: %d:%s | sql: %s", id, db, sql)
-	biz.NotEmpty(sql, "sql不能为空")
-
-	execRes, err := d.DbSqlExecApp.Exec(&application.DbSqlExecReq{
+	execReq := &application.DbSqlExecReq{
 		DbId:         id,
 		Db:           db,
-		Sql:          sql,
 		Remark:       form.Remark,
 		DbInstance:   dbInstance,
 		LoginAccount: rc.LoginAccount,
-	})
-	biz.ErrIsNilAppendErr(err, "执行失败: %s")
+	}
+
+	sqls := strings.Split(sql, ";\n")
+	isMulti := len(sqls) > 1
+	var execResAll *application.DbSqlExecRes
+	for _, s := range sqls {
+		s = utils.StrTrimSpaceAndBr(s)
+		// 多条执行，如果有查询语句，则跳过
+		if isMulti && strings.HasPrefix(strings.ToLower(s), "select") {
+			continue
+		}
+		execReq.Sql = s
+		execRes, err := d.DbSqlExecApp.Exec(execReq)
+		biz.ErrIsNilAppendErr(err, "执行失败: %s")
+
+		if execResAll == nil {
+			execResAll = execRes
+		} else {
+			execResAll.Merge(execRes)
+		}
+	}
+
 	colAndRes := make(map[string]interface{})
-	colAndRes["colNames"] = execRes.ColNames
-	colAndRes["res"] = execRes.Res
+	colAndRes["colNames"] = execResAll.ColNames
+	colAndRes["res"] = execResAll.Res
 	rc.ResData = colAndRes
 }
 
diff --git a/server/internal/db/application/db.go b/server/internal/db/application/db.go
index 13507651..2fd0d107 100644
--- a/server/internal/db/application/db.go
+++ b/server/internal/db/application/db.go
@@ -358,7 +358,7 @@ func getDsn(d *entity.Db, db string) string {
 	var dsn string
 	if d.Type == entity.DbTypeMysql {
 		// 更多参数参考：https://github.com/go-sql-driver/mysql#dsn-data-source-name
-		dsn = fmt.Sprintf("%s:%s@%s(%s:%d)/%s?timeout=8s&multiStatements=true", d.Username, d.Password, d.Network, d.Host, d.Port, db)
+		dsn = fmt.Sprintf("%s:%s@%s(%s:%d)/%s?timeout=8s", d.Username, d.Password, d.Network, d.Host, d.Port, db)
 		if d.Params != "" {
 			dsn = fmt.Sprintf("%s&%s", dsn, d.Params)
 		}
diff --git a/server/internal/db/application/db_sql_exec.go b/server/internal/db/application/db_sql_exec.go
index fc99a1f7..45a17a64 100644
--- a/server/internal/db/application/db_sql_exec.go
+++ b/server/internal/db/application/db_sql_exec.go
@@ -25,6 +25,21 @@ type DbSqlExecRes struct {
 	Res      []map[string]interface{}
 }
 
+// 合并执行结果，主要用于执行多条sql使用
+func (d *DbSqlExecRes) Merge(execRes *DbSqlExecRes) {
+	canMerge := len(d.ColNames) == len(execRes.ColNames)
+	if !canMerge {
+		return
+	}
+	// 列名不一致，则不合并
+	for i, colName := range d.ColNames {
+		if execRes.ColNames[i] != colName {
+			return
+		}
+	}
+	d.Res = append(d.Res, execRes.Res...)
+}
+
 type DbSqlExec interface {
 	// 执行sql
 	Exec(execSqlReq *DbSqlExecReq) (*DbSqlExecRes, error)
@@ -187,16 +202,19 @@ func doInsert(insert *sqlparser.Insert, execSqlReq *DbSqlExecReq, dbSqlExec *ent
 
 func doExec(sql string, dbInstance *DbInstance) (*DbSqlExecRes, error) {
 	rowsAffected, err := dbInstance.Exec(sql)
+	execRes := "success"
 	if err != nil {
-		return nil, err
+		execRes = err.Error()
 	}
 	res := make([]map[string]interface{}, 0)
 	resData := make(map[string]interface{})
-	resData["影响条数"] = rowsAffected
+	resData["rowsAffected"] = rowsAffected
+	resData["sql"] = sql
+	resData["result"] = execRes
 	res = append(res, resData)
 
 	return &DbSqlExecRes{
-		ColNames: []string{"影响条数"},
+		ColNames: []string{"sql", "rowsAffected", "result"},
 		Res:      res,
 	}, nil
 }
diff --git a/server/pkg/utils/str_utils.go b/server/pkg/utils/str_utils.go
index bb4b5710..47d8313d 100644
--- a/server/pkg/utils/str_utils.go
+++ b/server/pkg/utils/str_utils.go
@@ -18,6 +18,14 @@ func StrTrim(str string) string {
 	return strings.Trim(str, " ")
 }
 
+// 去除字符串左右空字符与\n换行
+func StrTrimSpaceAndBr(str string) string {
+	return strings.TrimFunc(str, func(r rune) bool {
+		s := string(r)
+		return s == " " || s == "\n"
+	})
+}
+
 func SubString(str string, begin, end int) (substr string) {
 	// 将字符串的转换成[]rune
 	rs := []rune(str)