|
|
@@ -10,7 +10,7 @@ import (
|
|
10
|
10
|
)
|
|
11
|
11
|
|
|
12
|
12
|
// QueryToCSV 无参数查询并返回 CSV 字节数据
|
|
13
|
|
-func QueryToCSV(db *sqlx.DB, sql string) ([]byte, error) {
|
|
|
13
|
+func QueryToCSV(db *sqlx.DB, sql string, writerHeader bool) ([]byte, error) {
|
|
14
|
14
|
if sql == "" {
|
|
15
|
15
|
return nil, fmt.Errorf("SQL query cannot be empty")
|
|
16
|
16
|
}
|
|
|
@@ -20,11 +20,11 @@ func QueryToCSV(db *sqlx.DB, sql string) ([]byte, error) {
|
|
20
|
20
|
return nil, fmt.Errorf("query execution failed: %v", err)
|
|
21
|
21
|
}
|
|
22
|
22
|
|
|
23
|
|
- return rowsToCSV(rows)
|
|
|
23
|
+ return rowsToCSV(rows, writerHeader)
|
|
24
|
24
|
}
|
|
25
|
25
|
|
|
26
|
26
|
// QueryParamsToCSV 位置参数查询并返回 CSV 字节数据
|
|
27
|
|
-func QueryPositionalToCSV(db *sqlx.DB, sql string, params []interface{}) ([]byte, error) {
|
|
|
27
|
+func QueryPositionalToCSV(db *sqlx.DB, sql string, writerHeader bool, params []interface{}) ([]byte, error) {
|
|
28
|
28
|
if sql == "" {
|
|
29
|
29
|
return nil, fmt.Errorf("SQL query cannot be empty")
|
|
30
|
30
|
}
|
|
|
@@ -34,12 +34,12 @@ func QueryPositionalToCSV(db *sqlx.DB, sql string, params []interface{}) ([]byte
|
|
34
|
34
|
return nil, fmt.Errorf("query execution failed: %v", err)
|
|
35
|
35
|
}
|
|
36
|
36
|
|
|
37
|
|
- return rowsToCSV(rows)
|
|
|
37
|
+ return rowsToCSV(rows, writerHeader)
|
|
38
|
38
|
}
|
|
39
|
39
|
|
|
40
|
40
|
// QueryParamsNameToCSV 命名参数查询并返回 CSV 字节数据
|
|
41
|
41
|
// params 可以是 map[string]interface{} 或结构体
|
|
42
|
|
-func QueryParamsNameToCSV(db *sqlx.DB, sql string, params map[string]interface{}) ([]byte, error) {
|
|
|
42
|
+func QueryParamsNameToCSV(db *sqlx.DB, sql string, writerHeader bool, params map[string]interface{}) ([]byte, error) {
|
|
43
|
43
|
if sql == "" {
|
|
44
|
44
|
return nil, fmt.Errorf("SQL query cannot be empty")
|
|
45
|
45
|
}
|
|
|
@@ -55,11 +55,11 @@ func QueryParamsNameToCSV(db *sqlx.DB, sql string, params map[string]interface{}
|
|
55
|
55
|
return nil, fmt.Errorf("query execution failed: %v", err)
|
|
56
|
56
|
}
|
|
57
|
57
|
|
|
58
|
|
- return rowsToCSV(rows)
|
|
|
58
|
+ return rowsToCSV(rows, writerHeader)
|
|
59
|
59
|
}
|
|
60
|
60
|
|
|
61
|
|
-// / rowsToCSV 公共方法:将查询结果转换为 CSV 字节数据
|
|
62
|
|
-func rowsToCSV(rows *sql.Rows) ([]byte, error) {
|
|
|
61
|
+// rowsToCSV 公共方法:将查询结果转换为 CSV 字节数据
|
|
|
62
|
+func rowsToCSV(rows *sql.Rows, writerHeader bool) ([]byte, error) {
|
|
63
|
63
|
defer rows.Close()
|
|
64
|
64
|
|
|
65
|
65
|
columns, err := rows.Columns()
|
|
|
@@ -70,9 +70,11 @@ func rowsToCSV(rows *sql.Rows) ([]byte, error) {
|
|
70
|
70
|
var builder strings.Builder
|
|
71
|
71
|
writer := csv.NewWriter(&builder)
|
|
72
|
72
|
|
|
73
|
|
- // 写入表头
|
|
74
|
|
- if err := writer.Write(columns); err != nil {
|
|
75
|
|
- return nil, fmt.Errorf("failed to write CSV header: %v", err)
|
|
|
73
|
+ // 根据参数决定是否写入表头
|
|
|
74
|
+ if writerHeader {
|
|
|
75
|
+ if err := writer.Write(columns); err != nil {
|
|
|
76
|
+ return nil, fmt.Errorf("failed to write CSV header: %v", err)
|
|
|
77
|
+ }
|
|
76
|
78
|
}
|
|
77
|
79
|
|
|
78
|
80
|
for rows.Next() {
|