测试通过

factory/execute.go

@@ -0,0 +1,115 @@
+package factory
+
+import (
+	"database/sql"
+	"fmt"
+)
+
+// ExecuteDDL 执行DDL语句（创建、删除、更新表等）
+func (f *DBFactory) ExecuteDDL(db *sql.DB, ddlSQL string) error {
+	if db == nil {
+		return fmt.Errorf("database connection is nil")
+	}
+
+	if ddlSQL == "" {
+		return fmt.Errorf("DDL SQL statement is empty")
+	}
+
+	// 执行DDL语句
+	_, err := db.Exec(ddlSQL)
+	if err != nil {
+		return fmt.Errorf("failed to execute DDL: %v", err)
+	}
+
+	return nil
+}
+
+// ExecuteDDLWithTx 在事务中执行DDL语句
+func (f *DBFactory) ExecuteDDLWithTx(db *sql.DB, ddlSQL string) error {
+	if db == nil {
+		return fmt.Errorf("database connection is nil")
+	}
+
+	if ddlSQL == "" {
+		return fmt.Errorf("DDL SQL statement is empty")
+	}
+
+	// 开始事务
+	tx, err := db.Begin()
+	if err != nil {
+		return fmt.Errorf("failed to begin transaction: %v", err)
+	}
+
+	// 执行DDL语句
+	_, err = tx.Exec(ddlSQL)
+	if err != nil {
+		// 回滚事务
+		tx.Rollback()
+		return fmt.Errorf("failed to execute DDL in transaction: %v", err)
+	}
+
+	// 提交事务
+	if err := tx.Commit(); err != nil {
+		return fmt.Errorf("failed to commit transaction: %v", err)
+	}
+
+	return nil
+}
+
+// ExecuteMultipleDDL 执行多个DDL语句
+func (f *DBFactory) ExecuteMultipleDDL(db *sql.DB, ddlSQLs []string) error {
+	if db == nil {
+		return fmt.Errorf("database connection is nil")
+	}
+
+	if len(ddlSQLs) == 0 {
+		return fmt.Errorf("DDL SQL statements are empty")
+	}
+
+	// 开始事务
+	tx, err := db.Begin()
+	if err != nil {
+		return fmt.Errorf("failed to begin transaction: %v", err)
+	}
+
+	// 依次执行所有DDL语句
+	for i, ddlSQL := range ddlSQLs {
+		if ddlSQL == "" {
+			tx.Rollback()
+			return fmt.Errorf("DDL SQL statement at index %d is empty", i)
+		}
+
+		_, err = tx.Exec(ddlSQL)
+		if err != nil {
+			tx.Rollback()
+			return fmt.Errorf("failed to execute DDL at index %d: %v", i, err)
+		}
+	}
+
+	// 提交事务
+	if err := tx.Commit(); err != nil {
+		return fmt.Errorf("failed to commit transaction: %v", err)
+	}
+
+	return nil
+}
+
+// 快捷方法 - 对外暴露的DDL执行方法
+
+// QuickExecuteDDL 快捷执行DDL语句
+func QuickExecuteDDL(db *sql.DB, ddlSQL string) error {
+	factory := &DBFactory{}
+	return factory.ExecuteDDL(db, ddlSQL)
+}
+
+// QuickExecuteDDLWithTx 快捷在事务中执行DDL语句
+func QuickExecuteDDLWithTx(db *sql.DB, ddlSQL string) error {
+	factory := &DBFactory{}
+	return factory.ExecuteDDLWithTx(db, ddlSQL)
+}
+
+// QuickExecuteMultipleDDL 快捷执行多个DDL语句
+func QuickExecuteMultipleDDL(db *sql.DB, ddlSQLs []string) error {
+	factory := &DBFactory{}
+	return factory.ExecuteMultipleDDL(db, ddlSQLs)
+}

factory/factory.go

@@ -77,43 +77,61 @@ func (f *DBFactory) GetAvailableDrivers() []string {
 }
 
 // CreateQueryExecutor 创建查询执行器
-func (f *DBFactory) CreateQueryExecutor(db *sql.DB) *QueryExecutor {
-	return NewQueryExecutor(db)
-}
+// func (f *DBFactory) CreateQueryExecutor(db *sql.DB) *QueryExecutor {
+// 	return newQueryExecutor(db)
+// }
 
 // -------------- 对外暴露的初始化方法（核心入口）--------------
 // NewDBQuery 初始化查询实例（对外提供唯一初始化入口）
 // db: 已初始化的数据库连接（由调用方传入，解耦数据库配置）
-func NewDBQuery(db *sql.DB) *QueryExecutor {
-	return NewQueryExecutor(db)
+func newDBQuery(db *sql.DB) *QueryExecutor {
+	return newQueryExecutor(db)
 }
 
 // QuickQueryToJSON 快捷查询，直接返回 JSON 字节流
-func QuickQueryToJSON(db *sql.DB, sql string) *types.QueryResult {
-	return NewDBQuery(db).QueryToJSON(sql)
+func QueryToJSON(db *sql.DB, sql string) *types.QueryResult {
+	return newDBQuery(db).QueryToJSON(sql)
 }
 
 // QuickQueryToCSV 快捷查询，直接返回 CSV 字符串（包含表头）
-func QuickQueryToCSV(db *sql.DB, sql string) ([]byte, error) {
-	return NewDBQuery(db).QueryToCSV(sql)
+func QueryToCSV(db *sql.DB, sql string) ([]byte, error) {
+	return newDBQuery(db).QueryToCSV(sql)
 }
 
 // QuickExecuteWithColumns 快捷查询，返回完整结果（含列信息）
-func QuickExecuteWithColumns(db *sql.DB, sql string) *types.QueryResult {
-	return NewDBQuery(db).ExecuteQueryWithColumns(sql)
+func QueryWithColumns(db *sql.DB, sql string) *types.QueryResult {
+	return newDBQuery(db).ExecuteQueryWithColumns(sql)
 }
 
 // QuickExecuteDataOnly 快捷查询，返回纯数据（性能优先）
-func QuickExecuteDataOnly(db *sql.DB, sql string) *types.QueryResult {
-	return NewDBQuery(db).ExecuteQueryDataOnly(sql)
+func QueryDataOnly(db *sql.DB, sql string) *types.QueryResult {
+	return newDBQuery(db).ExecuteQueryDataOnly(sql)
 }
 
 // QuickExecuteCSV 快捷查询，返回 CSV 格式结果（支持自定义是否包含表头）
-func QuickExecuteCSV(db *sql.DB, sql string, includeHeader bool) *types.QueryResult {
-	return NewDBQuery(db).ExecuteQueryCSV(sql, includeHeader)
+func QueryCSV(db *sql.DB, sql string, includeHeader bool) *types.QueryResult {
+	return newDBQuery(db).ExecuteQueryCSV(sql, includeHeader)
 }
 
 // QuickExecuteCSVStream 快捷流式输出 CSV（直接写入 io.Writer，适合大文件）
-func QuickExecuteCSVStream(db *sql.DB, sql string, w io.Writer, includeHeader bool) (int, error) {
-	return NewDBQuery(db).ExecuteQueryCSVStream(sql, w, includeHeader)
+func QueryCSVStream(db *sql.DB, sql string, w io.Writer, includeHeader bool) (int, error) {
+	return newDBQuery(db).ExecuteQueryCSVStream(sql, w, includeHeader)
+}
+
+// QuickExecuteDDL 快捷执行DDL语句
+func ExecuteDDL(db *sql.DB, ddlSQL string) error {
+	factory := &DBFactory{}
+	return factory.ExecuteDDL(db, ddlSQL)
+}
+
+// QuickExecuteDDLWithTx 快捷在事务中执行DDL语句
+func ExecuteDDLWithTx(db *sql.DB, ddlSQL string) error {
+	factory := &DBFactory{}
+	return factory.ExecuteDDLWithTx(db, ddlSQL)
+}
+
+// QuickExecuteMultipleDDL 快捷执行多个DDL语句
+func ExecuteMultipleDDL(db *sql.DB, ddlSQLs []string) error {
+	factory := &DBFactory{}
+	return factory.ExecuteMultipleDDL(db, ddlSQLs)
 }

factory/query.go

@@ -22,7 +22,7 @@ type QueryExecutor struct {
 }
 
 // NewQueryExecutor 创建查询执行器
-func NewQueryExecutor(db *sql.DB) *QueryExecutor {
+func newQueryExecutor(db *sql.DB) *QueryExecutor {
 	return &QueryExecutor{db: db}
 }
 

go.mod

@@ -1,3 +1,4 @@
+// v0.1.12
 module git.x2erp.com/qdy/go-db
 
 go 1.25.4