mirror of
https://github.com/Syngnat/GoNavi.git
synced 2026-05-13 17:29:46 +08:00
- 为查询结果扫描增加稳定列名归一化,重复列自动追加序号后缀 - 统一返回字段列表与行数据键名,避免同名列值被后写覆盖 - 补充 scanRows 回归测试并更新 issue backlog 记录 Fixes #348
126 lines
2.8 KiB
Go
126 lines
2.8 KiB
Go
package db
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
|
|
"GoNavi-Wails/internal/connection"
|
|
)
|
|
|
|
func scanRows(rows *sql.Rows) ([]map[string]interface{}, []string, error) {
|
|
columns, err := rows.Columns()
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
columns = ensureUniqueQueryColumnNames(columns)
|
|
|
|
colTypes, err := rows.ColumnTypes()
|
|
if err != nil || len(colTypes) != len(columns) {
|
|
colTypes = nil
|
|
}
|
|
|
|
resultData := make([]map[string]interface{}, 0)
|
|
|
|
for rows.Next() {
|
|
values := make([]interface{}, len(columns))
|
|
valuePtrs := make([]interface{}, len(columns))
|
|
for i := range columns {
|
|
valuePtrs[i] = &values[i]
|
|
}
|
|
|
|
if err := rows.Scan(valuePtrs...); err != nil {
|
|
continue
|
|
}
|
|
|
|
entry := make(map[string]interface{}, len(columns))
|
|
for i, col := range columns {
|
|
dbTypeName := ""
|
|
if colTypes != nil && i < len(colTypes) && colTypes[i] != nil {
|
|
dbTypeName = colTypes[i].DatabaseTypeName()
|
|
}
|
|
entry[col] = normalizeQueryValueWithDBType(values[i], dbTypeName)
|
|
}
|
|
resultData = append(resultData, entry)
|
|
}
|
|
|
|
if err := rows.Err(); err != nil {
|
|
return resultData, columns, err
|
|
}
|
|
return resultData, columns, nil
|
|
}
|
|
|
|
func ensureUniqueQueryColumnNames(columns []string) []string {
|
|
if len(columns) == 0 {
|
|
return columns
|
|
}
|
|
|
|
uniqueColumns := make([]string, len(columns))
|
|
taken := make(map[string]struct{}, len(columns))
|
|
nextSuffix := make(map[string]int, len(columns))
|
|
|
|
for idx, column := range columns {
|
|
base := column
|
|
if base == "" {
|
|
base = fmt.Sprintf("column_%d", idx+1)
|
|
}
|
|
|
|
candidate := base
|
|
if _, exists := taken[candidate]; exists {
|
|
suffix := nextSuffix[base]
|
|
if suffix < 2 {
|
|
suffix = 2
|
|
}
|
|
for {
|
|
candidate = fmt.Sprintf("%s_%d", base, suffix)
|
|
if _, exists := taken[candidate]; !exists {
|
|
break
|
|
}
|
|
suffix++
|
|
}
|
|
nextSuffix[base] = suffix + 1
|
|
} else {
|
|
nextSuffix[base] = 2
|
|
}
|
|
|
|
uniqueColumns[idx] = candidate
|
|
taken[candidate] = struct{}{}
|
|
}
|
|
|
|
return uniqueColumns
|
|
}
|
|
|
|
// scanMultiRows 遍历 sql.Rows 中的所有结果集,将每个结果集作为 ResultSetData 返回。
|
|
// 利用 rows.NextResultSet() 支持一次 query 返回多个结果集的场景。
|
|
func scanMultiRows(rows *sql.Rows) ([]connection.ResultSetData, error) {
|
|
var results []connection.ResultSetData
|
|
for {
|
|
data, cols, err := scanRows(rows)
|
|
if err != nil {
|
|
return results, err
|
|
}
|
|
if data == nil {
|
|
data = make([]map[string]interface{}, 0)
|
|
}
|
|
if cols == nil {
|
|
cols = []string{}
|
|
}
|
|
results = append(results, connection.ResultSetData{
|
|
Rows: data,
|
|
Columns: cols,
|
|
})
|
|
if !rows.NextResultSet() {
|
|
break
|
|
}
|
|
}
|
|
if len(results) == 0 {
|
|
results = []connection.ResultSetData{{
|
|
Rows: make([]map[string]interface{}, 0),
|
|
Columns: []string{},
|
|
}}
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return results, err
|
|
}
|
|
return results, nil
|
|
}
|