u

code/go-project/base-farmework/pkg/utils/db/select.go

@@ -1,62 +1,63 @@
 package db
 
-import (
-	"database/sql"
-	"fmt"
-)
+import "database/sql"
 
-func (c *Client) QueryRows(query string) ([]map[string]interface{}, error) {
-	if c.Conn == nil {
-		return nil, fmt.Errorf("database connection is nil")
-	}
-
-	rows, err := c.Conn.Query(query)
-	if err != nil {
-		return nil, fmt.Errorf("query error: %v", err)
-	}
-	defer func(rows *sql.Rows) {
-		err := rows.Close()
-		if err != nil {
-			fmt.Println("关闭资源失败")
-		}
-	}(rows)
-
-	// 获取列名
-	cols, err := rows.Columns()
+func (c *Client) Select(query string, args ...any) ([]map[string]any, error) {
+	rows, err := c.query(query, args...)
 	if err != nil {
 		return nil, err
 	}
+	defer func(rows *sql.Rows) {
+		_ = rows.Close()
+	}(rows)
 
-	var result []map[string]interface{}
+	cols, _ := rows.Columns()
+	var result []map[string]any
 
 	for rows.Next() {
-		// 创建扫描用的切片
-		columnPointers := make([]interface{}, len(cols))
-		columnValues := make([]interface{}, len(cols))
-		for i := range columnPointers {
-			columnPointers[i] = &columnValues[i]
+		columns := make([]any, len(cols))
+		columnPointers := make([]any, len(cols))
+		for i := range columns {
+			columnPointers[i] = &columns[i]
 		}
-
 		if err := rows.Scan(columnPointers...); err != nil {
 			return nil, err
 		}
-
-		rowMap := make(map[string]interface{})
+		rowMap := make(map[string]any)
 		for i, colName := range cols {
-			val := columnValues[i]
-			if b, ok := val.([]byte); ok {
-				rowMap[colName] = string(b)
-			} else {
-				rowMap[colName] = val
-			}
+			rowMap[colName] = columns[i]
 		}
-
 		result = append(result, rowMap)
 	}
+	return result, nil
+}
 
-	if err := rows.Err(); err != nil {
+func (c *Client) SelectOne(query string, args ...any) (map[string]any, error) {
+	rows, err := c.query(query, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer func(rows *sql.Rows) {
+		_ = rows.Close()
+	}(rows)
+
+	if !rows.Next() {
+		return nil, sql.ErrNoRows
+	}
+
+	cols, _ := rows.Columns()
+	columns := make([]any, len(cols))
+	columnPointers := make([]any, len(cols))
+	for i := range columns {
+		columnPointers[i] = &columns[i]
+	}
+	if err := rows.Scan(columnPointers...); err != nil {
 		return nil, err
 	}
 
-	return result, nil
+	rowMap := make(map[string]any)
+	for i, colName := range cols {
+		rowMap[colName] = columns[i]
+	}
+	return rowMap, nil
 }