u

code/allapp/allapp-go-v3/pkg/db/delete.go

@@ -6,96 +6,49 @@ import (
 	"strings"
 )
 
-func (c *Client) Delete(
-	ctx context.Context,
-	table string,
-	keyField string,
-	data map[string]any,
-) error {
-	if keyField == "" {
-		return fmt.Errorf("keyField 不能为空")
-	}
-
-	rawTable := table
-
-	keyVal, err := validateData(rawTable, keyField, data)
+func (c *Client) Delete(ctx context.Context, table, keyField string, data map[string]any) error {
+	keyVal, err := validateData(table, keyField, data)
 	if err != nil {
 		return err
 	}
 
-	tableParts := strings.Split(table, ".")
-	for i, p := range tableParts {
-		tableParts[i] = `"` + p + `"`
-	}
-	table = strings.Join(tableParts, ".")
-
-	keyField = `"` + keyField + `"`
-
 	sql := fmt.Sprintf(
-		"DELETE FROM %s WHERE %s = $1",
-		table,
-		keyField,
+		"DELETE FROM %s WHERE %s=$1",
+		quoteTable(table),
+		quoteCol(keyField),
 	)
 
 	_, err = c.exec().Exec(ctx, sql, keyVal)
 	return err
 }
 
-func (c *Client) BatchDelete(
-	ctx context.Context,
-	table string,
-	keyField string,
-	dataList []map[string]any,
-) error {
-
-	if table == "" {
-		return fmt.Errorf("表名不能为空")
+func (c *Client) BatchDelete(ctx context.Context, table, keyField string, list []map[string]any) error {
+	if len(list) == 0 {
+		return fmt.Errorf("empty data")
 	}
 
-	if keyField == "" {
-		return fmt.Errorf("主键字段不能为空")
-	}
-
-	if len(dataList) == 0 {
-		return fmt.Errorf("数据不能为空")
-	}
-
-	rawTable := table
-
-	tableParts := strings.Split(table, ".")
-	for i, p := range tableParts {
-		tableParts[i] = `"` + p + `"`
-	}
-	table = strings.Join(tableParts, ".")
-
-	keyFieldQuoted := `"` + keyField + `"`
-
 	var (
-		placeholders []string
-		args         []any
-		argIndex     = 1
+		args []any
+		in   []string
+		i    = 1
 	)
 
-	for _, data := range dataList {
-		keyVal, err := validateData(rawTable, keyField, data)
+	for _, row := range list {
+		v, err := validateData(table, keyField, row)
 		if err != nil {
 			return err
 		}
 
-		if keyVal == nil {
-			return fmt.Errorf("主键字段值不能为空")
-		}
-
-		placeholders = append(placeholders, fmt.Sprintf("$%d", argIndex))
-		args = append(args, keyVal)
-		argIndex++
+		in = append(in, fmt.Sprintf("$%d", i))
+		args = append(args, v)
+		i++
 	}
 
 	sql := fmt.Sprintf(
 		"DELETE FROM %s WHERE %s IN (%s)",
-		table,
-		keyFieldQuoted,
-		strings.Join(placeholders, ", "),
+		quoteTable(table),
+		quoteCol(keyField),
+		strings.Join(in, ", "),
 	)
 
 	_, err := c.exec().Exec(ctx, sql, args...)