增加工具

factory/factory.go

@@ -94,7 +94,7 @@ func QuickQueryToJSON(db *sql.DB, sql string) *types.QueryResult {
 }
 
 // QuickQueryToCSV 快捷查询，直接返回 CSV 字符串（包含表头）
-func QuickQueryToCSV(db *sql.DB, sql string) *types.QueryResult {
+func QuickQueryToCSV(db *sql.DB, sql string) ([]byte, error) {
 	return NewDBQuery(db).QueryToCSV(sql)
 }
 

factory/query.go

@@ -107,47 +107,33 @@ func (e *QueryExecutor) QueryToJSON(sql string) *types.QueryResult {
 	return result
 }
 
-// QueryToCSV 查询并返回 CSV 字符串（包含表头，统一返回QueryResult）
-func (e *QueryExecutor) QueryToCSV(sql string) *types.QueryResult {
-	startTime := time.Now()
-	result := &types.QueryResult{}
+// QueryToCSV 查询并返回 CSV 字节数据（包含表头）
+func (e *QueryExecutor) QueryToCSV(sql string) ([]byte, error) {
 
 	if sql == "" {
-		result.Success = false
-		result.Error = "SQL query cannot be empty"
-		result.Time = time.Since(startTime).String()
-		return result
+		return nil, fmt.Errorf("SQL query cannot be empty")
 	}
 
 	rows, err := e.db.Query(sql)
 	if err != nil {
-		result.Success = false
-		result.Error = fmt.Sprintf("Query execution failed: %v", err)
-		result.Time = time.Since(startTime).String()
-		return result
+		return nil, fmt.Errorf("query execution failed: %v", err)
 	}
 	defer rows.Close()
 
 	columns, err := rows.Columns()
 	if err != nil {
-		result.Success = false
-		result.Error = fmt.Sprintf("Failed to get columns: %v", err)
-		result.Time = time.Since(startTime).String()
-		return result
+		return nil, fmt.Errorf("failed to get columns: %v", err)
 	}
 
 	var builder strings.Builder
 	writer := csv.NewWriter(&builder)
-	count := 0
 
 	// 写入表头
 	if err := writer.Write(columns); err != nil {
-		result.Success = false
-		result.Error = fmt.Sprintf("Failed to write CSV header: %v", err)
-		result.Time = time.Since(startTime).String()
-		return result
+		return nil, fmt.Errorf("failed to write CSV header: %v", err)
 	}
 
+	count := 0
 	for rows.Next() {
 		count++
 		values := make([]interface{}, len(columns))
@@ -157,10 +143,7 @@ func (e *QueryExecutor) QueryToCSV(sql string) *types.QueryResult {
 		}
 
 		if err := rows.Scan(valuePtrs...); err != nil {
-			result.Success = false
-			result.Error = fmt.Sprintf("Failed to scan row: %v", err)
-			result.Time = time.Since(startTime).String()
-			return result
+			return nil, fmt.Errorf("failed to scan row: %v", err)
 		}
 
 		// 所有值转为字符串
@@ -174,37 +157,20 @@ func (e *QueryExecutor) QueryToCSV(sql string) *types.QueryResult {
 		}
 
 		if err := writer.Write(row); err != nil {
-			result.Success = false
-			result.Error = fmt.Sprintf("Failed to write CSV row: %v", err)
-			result.Time = time.Since(startTime).String()
-			return result
+			return nil, fmt.Errorf("failed to write CSV row: %v", err)
 		}
 	}
 
 	writer.Flush()
 	if err := writer.Error(); err != nil {
-		result.Success = false
-		result.Error = fmt.Sprintf("Failed to flush CSV: %v", err)
-		result.Time = time.Since(startTime).String()
-		return result
+		return nil, fmt.Errorf("failed to flush CSV: %v", err)
 	}
 
 	if err := rows.Err(); err != nil {
-		result.Success = false
-		result.Error = fmt.Sprintf("Row iteration error: %v", err)
-		result.Time = time.Since(startTime).String()
-		return result
+		return nil, fmt.Errorf("row iteration error: %v", err)
 	}
 
-	result.Success = true
-	result.Data = map[string]interface{}{
-		"csv":           builder.String(),
-		"count":         count,
-		"includeHeader": true,
-	}
-	result.Count = count
-	result.Time = time.Since(startTime).String()
-	return result
+	return []byte(builder.String()), nil
 }
 
 // ExecuteQueryWithColumns 执行查询并返回完整结果（包含列信息）

go.sum

@@ -2,6 +2,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 git.x2erp.com/qdy/go-base v0.1.6 h1:25Fv2xvRmf3YZFmYiO1PmeR6molT0ucBRwKDE5DHr6Y=
 git.x2erp.com/qdy/go-base v0.1.6/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
+git.x2erp.com/qdy/go-base v0.1.7 h1:IdhNbvUyQZtPDTsccZArzE0C+OcGf0/XjEy2Xcu1WHI=
+git.x2erp.com/qdy/go-base v0.1.7/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=