测试通过

factory/execute.go

@@ -6,7 +6,7 @@ import (
 )
 
 // ExecuteDDL 执行DDL语句（创建、删除、更新表等）
-func (f *DBFactory) ExecuteDDL(db *sql.DB, ddlSQL string) error {
+func (f *DBFactory) executeDDL(db *sql.DB, ddlSQL string) error {
 	if db == nil {
 		return fmt.Errorf("database connection is nil")
 	}
@@ -25,7 +25,7 @@ func (f *DBFactory) ExecuteDDL(db *sql.DB, ddlSQL string) error {
 }
 
 // ExecuteDDLWithTx 在事务中执行DDL语句
-func (f *DBFactory) ExecuteDDLWithTx(db *sql.DB, ddlSQL string) error {
+func (f *DBFactory) executeDDLWithTx(db *sql.DB, ddlSQL string) error {
 	if db == nil {
 		return fmt.Errorf("database connection is nil")
 	}
@@ -57,7 +57,7 @@ func (f *DBFactory) ExecuteDDLWithTx(db *sql.DB, ddlSQL string) error {
 }
 
 // ExecuteMultipleDDL 执行多个DDL语句
-func (f *DBFactory) ExecuteMultipleDDL(db *sql.DB, ddlSQLs []string) error {
+func (f *DBFactory) executeMultipleDDL(db *sql.DB, ddlSQLs []string) error {
 	if db == nil {
 		return fmt.Errorf("database connection is nil")
 	}
@@ -93,23 +93,3 @@ func (f *DBFactory) ExecuteMultipleDDL(db *sql.DB, ddlSQLs []string) error {
 
 	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

@@ -84,54 +84,79 @@ func (f *DBFactory) GetAvailableDrivers() []string {
 // -------------- 对外暴露的初始化方法（核心入口）--------------
 // NewDBQuery 初始化查询实例（对外提供唯一初始化入口）
 // db: 已初始化的数据库连接（由调用方传入，解耦数据库配置）
-func newDBQuery(db *sql.DB) *QueryExecutor {
+func newDBQuery(db *sql.DB) *queryExecutor {
 	return newQueryExecutor(db)
 }
 
 // QuickQueryToJSON 快捷查询，直接返回 JSON 字节流
 func QueryToJSON(db *sql.DB, sql string) *types.QueryResult {
-	return newDBQuery(db).QueryToJSON(sql)
+	return newDBQuery(db).queryToJSON(sql)
 }
 
 // QuickQueryToCSV 快捷查询，直接返回 CSV 字符串（包含表头）
 func QueryToCSV(db *sql.DB, sql string) ([]byte, error) {
-	return newDBQuery(db).QueryToCSV(sql)
+	return newDBQuery(db).queryToCSV(sql)
 }
 
 // QuickExecuteWithColumns 快捷查询，返回完整结果（含列信息）
 func QueryWithColumns(db *sql.DB, sql string) *types.QueryResult {
-	return newDBQuery(db).ExecuteQueryWithColumns(sql)
+	return newDBQuery(db).queryWithColumns(sql)
 }
 
 // QuickExecuteDataOnly 快捷查询，返回纯数据（性能优先）
 func QueryDataOnly(db *sql.DB, sql string) *types.QueryResult {
-	return newDBQuery(db).ExecuteQueryDataOnly(sql)
+	return newDBQuery(db).queryDataOnly(sql)
 }
 
 // QuickExecuteCSV 快捷查询，返回 CSV 格式结果（支持自定义是否包含表头）
 func QueryCSV(db *sql.DB, sql string, includeHeader bool) *types.QueryResult {
-	return newDBQuery(db).ExecuteQueryCSV(sql, includeHeader)
+	return newDBQuery(db).queryCSV(sql, includeHeader)
 }
 
 // QuickExecuteCSVStream 快捷流式输出 CSV（直接写入 io.Writer，适合大文件）
 func QueryCSVStream(db *sql.DB, sql string, w io.Writer, includeHeader bool) (int, error) {
-	return newDBQuery(db).ExecuteQueryCSVStream(sql, w, includeHeader)
+	return newDBQuery(db).queryCSVStream(sql, w, includeHeader)
 }
 
 // QuickExecuteDDL 快捷执行DDL语句
 func ExecuteDDL(db *sql.DB, ddlSQL string) error {
 	factory := &DBFactory{}
-	return factory.ExecuteDDL(db, ddlSQL)
+	return factory.executeDDL(db, ddlSQL)
 }
 
 // QuickExecuteDDLWithTx 快捷在事务中执行DDL语句
 func ExecuteDDLWithTx(db *sql.DB, ddlSQL string) error {
 	factory := &DBFactory{}
-	return factory.ExecuteDDLWithTx(db, ddlSQL)
+	return factory.executeDDLWithTx(db, ddlSQL)
 }
 
 // QuickExecuteMultipleDDL 快捷执行多个DDL语句
 func ExecuteMultipleDDL(db *sql.DB, ddlSQLs []string) error {
 	factory := &DBFactory{}
-	return factory.ExecuteMultipleDDL(db, ddlSQLs)
+	return factory.executeMultipleDDL(db, ddlSQLs)
+}
+
+// testConnection 测试数据库连接
+func TestConnection(db *sql.DB, dbType string) error {
+	var query string
+	switch dbType {
+	case "mysql", "postgres", "sqlserver":
+		query = "SELECT 1"
+	case "oracle":
+		query = "SELECT 1 FROM DUAL"
+	default:
+		query = "SELECT 1"
+	}
+
+	var result int
+	err := db.QueryRow(query).Scan(&result)
+	if err != nil {
+		return err
+	}
+
+	if result != 1 {
+		return fmt.Errorf("unexpected test result: %d", result)
+	}
+
+	return nil
 }

factory/query.go

@@ -12,22 +12,22 @@ import (
 	"git.x2erp.com/qdy/go-base/types"
 )
 
-func typesFunction() *types.QueryResult { // 确保使用了该包导出的类型，例如 QueryResult
-	return &types.QueryResult{}
-}
+// func typesFunction() *types.QueryResult { // 确保使用了该包导出的类型，例如 QueryResult
+// 	return &types.QueryResult{}
+// }
 
 // QueryExecutor 查询执行器
-type QueryExecutor struct {
+type queryExecutor struct {
 	db *sql.DB
 }
 
 // NewQueryExecutor 创建查询执行器
-func newQueryExecutor(db *sql.DB) *QueryExecutor {
-	return &QueryExecutor{db: db}
+func newQueryExecutor(db *sql.DB) *queryExecutor {
+	return &queryExecutor{db: db}
 }
 
 // QueryToJSON 执行查询并返回JSON格式数据（统一返回QueryResult）
-func (e *QueryExecutor) QueryToJSON(sql string) *types.QueryResult {
+func (e *queryExecutor) queryToJSON(sql string) *types.QueryResult {
 	startTime := time.Now()
 	result := &types.QueryResult{}
 
@@ -108,7 +108,7 @@ func (e *QueryExecutor) QueryToJSON(sql string) *types.QueryResult {
 }
 
 // QueryToCSV 查询并返回 CSV 字节数据（包含表头）
-func (e *QueryExecutor) QueryToCSV(sql string) ([]byte, error) {
+func (e *queryExecutor) queryToCSV(sql string) ([]byte, error) {
 
 	if sql == "" {
 		return nil, fmt.Errorf("SQL query cannot be empty")
@@ -174,7 +174,7 @@ func (e *QueryExecutor) QueryToCSV(sql string) ([]byte, error) {
 }
 
 // ExecuteQueryWithColumns 执行查询并返回完整结果（包含列信息）
-func (e *QueryExecutor) ExecuteQueryWithColumns(sql string) *types.QueryResult {
+func (e *queryExecutor) queryWithColumns(sql string) *types.QueryResult {
 	startTime := time.Now()
 	result := &types.QueryResult{}
 
@@ -253,7 +253,7 @@ func (e *QueryExecutor) ExecuteQueryWithColumns(sql string) *types.QueryResult {
 }
 
 // ExecuteQueryDataOnly 执行查询并返回纯数据（不包含列信息，性能更高）
-func (e *QueryExecutor) ExecuteQueryDataOnly(sql string) *types.QueryResult {
+func (e *queryExecutor) queryDataOnly(sql string) *types.QueryResult {
 	startTime := time.Now()
 	result := &types.QueryResult{}
 
@@ -334,7 +334,7 @@ func (e *QueryExecutor) ExecuteQueryDataOnly(sql string) *types.QueryResult {
 }
 
 // ExecuteQueryCSV 执行查询并返回CSV格式数据
-func (e *QueryExecutor) ExecuteQueryCSV(sql string, includeHeader bool) *types.QueryResult {
+func (e *queryExecutor) queryCSV(sql string, includeHeader bool) *types.QueryResult {
 	startTime := time.Now()
 	result := &types.QueryResult{}
 
@@ -459,7 +459,7 @@ func (e *QueryExecutor) ExecuteQueryCSV(sql string, includeHeader bool) *types.Q
 }
 
 // ExecuteQueryCSVStream 流式返回CSV数据
-func (e *QueryExecutor) ExecuteQueryCSVStream(sql string, w io.Writer, includeHeader bool) (int, error) {
+func (e *queryExecutor) queryCSVStream(sql string, w io.Writer, includeHeader bool) (int, error) {
 	rows, err := e.db.Query(sql)
 	if err != nil {
 		return 0, err

go.sum

@@ -1,9 +1,5 @@
 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=
 git.x2erp.com/qdy/go-base v0.1.9 h1:SuyYSt3Gp7aXiUQRCBNwhrusJ53wlCnagiTYs5eITlY=
 git.x2erp.com/qdy/go-base v0.1.9/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=