GithubBackup/MyGoNavi
1
0
Fork 0
mirror of https://github.com/Syngnat/GoNavi.git synced 2026-05-07 05:02:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

✨ feat(multi-query): 适配 MariaDB/SQLServer/DiROS 多结果集并增加回退提示

Browse Source 
- MariaDB: DSN 添加 multiStatements=true，实现 QueryMulti/QueryMultiContext
- SQL Server: 实现 QueryMulti/QueryMultiContext（go-mssqldb 原生支持批处理）
- DiROS: DSN 添加 multiStatements=true（继承 MySQLDB 的方法）
- Sphinx: 自动继承 MySQLDB 多结果集支持，无需额外改动
- 不支持原生多语句的数据源执行多条 SQL 时，前端展示 info 提示
- refs #235
This commit is contained in:
杨国锋
2026-03-17 22:53:24 +08:00
parent e6b822c967
commit 6ee0fea110
5 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/QueryEditor.tsx
View File

@@ -1437,6 +1437,10 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
});
});
// 后端附带的提示信息（如数据源不支持原生多语句执行的回退提示）
if (res.message) {
message.info(res.message);
}
if (resultSetDataArray.length > 1) {
message.success(`已执行完成，生成 ${nextResultSets.length} 个结果集。`);
} else if (nextResultSets.length === 0) {

7
internal/app/methods_db.go
View File

@@ -616,7 +616,12 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
if resultSets == nil {
resultSets = []connection.ResultSetData{}
}
return connection.QueryResult{Success: true, Data: resultSets, QueryID: queryID}
// 回退到逐条执行且有多条语句时，附加提示信息
var fallbackMsg string
if len(statements) > 1 {
fallbackMsg = fmt.Sprintf("当前数据源（%s）不支持原生多语句执行，已自动拆分为 %d 条语句逐条执行。", runConfig.Type, len(statements))
}
return connection.QueryResult{Success: true, Data: resultSets, QueryID: queryID, Message: fallbackMsg}
}
func (a *App) DBQueryIsolated(config connection.ConnectionConfig, dbName string, query string) connection.QueryResult {

2
internal/db/diros_impl.go
View File

@@ -151,7 +151,7 @@ func (d *DirosDB) getDSN(config connection.ConnectionConfig) (string, error) {
tlsMode := resolveMySQLTLSMode(config)
return fmt.Sprintf(
"%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds&tls=%s",
"%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds&tls=%s&multiStatements=true",
config.User, config.Password, protocol, address, database, timeout, url.QueryEscape(tlsMode),
), nil
}

26
internal/db/mariadb_impl.go
View File

@@ -41,7 +41,7 @@ func (m *MariaDB) getDSN(config connection.ConnectionConfig) (string, error) {
tlsMode := resolveMySQLTLSMode(config)
return fmt.Sprintf(
"%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds&tls=%s",
"%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds&tls=%s&multiStatements=true",
config.User, config.Password, protocol, address, database, timeout, url.QueryEscape(tlsMode),
), nil
}
@@ -84,6 +84,30 @@ func (m *MariaDB) Ping() error {
return m.conn.PingContext(ctx)
}
func (m *MariaDB) QueryMulti(query string) ([]connection.ResultSetData, error) {
if m.conn == nil {
return nil, fmt.Errorf("连接未打开")
}
rows, err := m.conn.Query(query)
if err != nil {
return nil, err
}
defer rows.Close()
return scanMultiRows(rows)
}
func (m *MariaDB) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
if m.conn == nil {
return nil, fmt.Errorf("连接未打开")
}
rows, err := m.conn.QueryContext(ctx, query)
if err != nil {
return nil, err
}
defer rows.Close()
return scanMultiRows(rows)
}
func (m *MariaDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
if m.conn == nil {
return nil, nil, fmt.Errorf("连接未打开")

24
internal/db/sqlserver_impl.go
View File

@@ -128,6 +128,30 @@ func (s *SqlServerDB) Ping() error {
return s.conn.PingContext(ctx)
}
func (s *SqlServerDB) QueryMulti(query string) ([]connection.ResultSetData, error) {
if s.conn == nil {
return nil, fmt.Errorf("连接未打开")
}
rows, err := s.conn.Query(query)
if err != nil {
return nil, err
}
defer rows.Close()
return scanMultiRows(rows)
}
func (s *SqlServerDB) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
if s.conn == nil {
return nil, fmt.Errorf("连接未打开")
}
rows, err := s.conn.QueryContext(ctx, query)
if err != nil {
return nil, err
}
defer rows.Close()
return scanMultiRows(rows)
}
func (s *SqlServerDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
if s.conn == nil {
return nil, nil, fmt.Errorf("连接未打开")