TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 00:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from kanzihuang/feature-export-databases

Browse Source 
fix: 前端 DBMS->数据操作->新建查询，页面不显示查询结果
This commit is contained in:
may-fly
2023-09-08 13:53:17 +08:00
committed by GitHub
parent b618b8f93b c324a030f9
commit d7a10d4032
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/internal/db/api/db.go
View File

@@ -174,9 +174,15 @@ func (d *Db) ExecSqlFile(rc *req.Ctx) {
go func() { go func() {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
var errInfo string
switch t := err.(type) { switch t := err.(type) {
case biz.BizError:
errInfo = t.Error()
case *biz.BizError: case *biz.BizError:
d.MsgApp.CreateAndSend(rc.LoginAccount, ws.ErrMsg("sql脚本执行失败", fmt.Sprintf("[%s]%s执行失败: [%s]", filename, dbConn.Info.GetLogDesc(), t.Error()))) errInfo = t.Error()
}
if len(errInfo) > 0 {
d.MsgApp.CreateAndSend(rc.LoginAccount, ws.ErrMsg("sql脚本执行失败", fmt.Sprintf("[%s]%s执行失败: [%s]", filename, dbConn.Info.GetLogDesc(), errInfo)))
} }
} }
}() }()

2
server/internal/db/application/db.go
View File

@@ -302,7 +302,7 @@ func selectDataByDb(db *sql.DB, selectSql string) ([]string, []map[string]any, e
err := walkTableRecord(db, selectSql, func(record map[string]any, columns []string) { err := walkTableRecord(db, selectSql, func(record map[string]any, columns []string) {
result = append(result, record) result = append(result, record)
if colNames == nil { if colNames == nil {
colNames = make([]string, 0, len(columns)) colNames = make([]string, len(columns))
copy(colNames, columns) copy(colNames, columns)
} }
}) })