多数据库测试通过

dbstart/db_bootstrapper.go

@@ -1,95 +0,0 @@
-package dbstart
-
-// import (
-// 	"log"
-
-// 	"git.x2erp.com/qdy/go-base/config"
-// 	"git.x2erp.com/qdy/go-base/logger"
-// 	"git.x2erp.com/qdy/go-db/factory/database"
-// )
-
-// // DBBootstrapper 数据库启动器
-// type DBBootstrapper struct {
-// 	DBFactories map[string]*database.DBFactory // 改为map存储多个数据库实例
-// 	cfg         config.IConfig
-// }
-
-// // NewDBBootstrapper 创建数据库启动器
-// func NewDBBootstrapper(cfg config.IConfig) *DBBootstrapper {
-// 	return &DBBootstrapper{
-// 		DBFactories: make(map[string]*database.DBFactory),
-// 		cfg:         cfg,
-// 	}
-// }
-
-// // Init 初始化默认数据库
-// func (db *DBBootstrapper) Init() *DBBootstrapper {
-// 	if db.cfg == nil {
-// 		log.Fatal("配置未初始化，请先传入配置")
-// 	}
-
-// 	// // 初始化默认数据库
-// 	// dbCfg := db.cfg.GetDatabaseConfig()
-// 	// if dbCfg == nil {
-// 	// 	log.Fatal("默认数据库配置未找到")
-// 	// }
-
-// 	// log.Printf("正在连接默认数据库: %s:%d/%s",
-// 	// 	dbCfg.Host, dbCfg.Port, dbCfg.Database)
-
-// 	dbFactory, err := database.GetDefaultDBFactory()
-// 	if err != nil {
-// 		log.Fatalf("默认数据库连接失败: %v", err)
-// 	}
-
-// 	db.DBFactories["default"] = dbFactory
-// 	log.Println("默认数据库连接成功")
-
-// 	return db
-// }
-
-// // GetDBFactory 获取数据库工厂
-// func (db *DBBootstrapper) GetDBFactory(dbName string) *database.DBFactory {
-// 	// 如果已经初始化，直接返回
-// 	if factory, exists := db.DBFactories[dbName]; exists {
-// 		return factory
-// 	}
-
-// 	// 如果还没初始化，按需初始化
-// 	dbFactory, err := database.GetDBFactory(dbName)
-// 	if err != nil {
-// 		log.Printf("❌ 获取数据库 '%s' 失败: %v", dbName, err)
-// 		return nil
-// 	}
-
-// 	db.DBFactories[dbName] = dbFactory
-// 	return dbFactory
-// }
-
-// // GetDefaultDBFactory 获取默认数据库工厂
-// func (db *DBBootstrapper) GetDefaultDBFactory() *database.DBFactory {
-// 	return db.GetDBFactory("default")
-// }
-
-// // Close 关闭所有数据库连接
-// func (db *DBBootstrapper) Close() {
-
-// 	for name, factory := range db.DBFactories {
-// 		logger.Info("正在关闭数据库: %s, factory: %v", name, factory)
-// 		if factory != nil {
-// 			factory.Close()
-// 			logger.Info("数据库 '%s' 连接已关闭", name)
-// 		} else {
-// 			logger.Error("⚠️  警告: 数据库 '%s' 的 factory 为 nil", name)
-// 		}
-// 	}
-
-// 	// 清空map
-// 	db.DBFactories = make(map[string]*database.DBFactory)
-// 	logger.Info("所有数据库连接已关闭.")
-// }
-
-// // 在 dbstart 包中
-// func (db *DBBootstrapper) OnShutdown() {
-// 	db.Close()
-// }

drivers/doris.go → driver/doris.go

@@ -1,4 +1,4 @@
-package drivers
+package driver
 
 import (
 	"fmt"

drivers/driver.go → driver/driver.go

@@ -1,4 +1,4 @@
-package drivers
+package driver
 
 import (
 	"fmt"

drivers/mysql.go → driver/mysql.go

@@ -1,4 +1,4 @@
-package drivers
+package driver
 
 import (
 	"fmt"

drivers/oracle.go → driver/oracle.go

@@ -1,4 +1,4 @@
-package drivers
+package driver
 
 import (
 	"fmt"

drivers/postgresql.go → driver/postgresql.go

@@ -1,4 +1,4 @@
-package drivers
+package driver
 
 import (
 	"fmt"

drivers/sqlserver.go → driver/sqlserver.go

@@ -1,4 +1,4 @@
-package drivers
+package driver
 
 import (
 	"fmt"

factory/database/db_factory.go

@@ -10,8 +10,8 @@ import (
 	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/logger"
 	"git.x2erp.com/qdy/go-base/model/response"
-	"git.x2erp.com/qdy/go-db/drivers"
-	"git.x2erp.com/qdy/go-db/functions"
+	"git.x2erp.com/qdy/go-db/driver"
+	"git.x2erp.com/qdy/go-db/function"
 
 	"github.com/jmoiron/sqlx"
 )
@@ -80,14 +80,14 @@ func createDBFactoryNew(config *subconfigs.DatabaseConfig) (*DBFactory, error) {
 	log.Printf("Creating database connection...")
 
 	// 获取对应的驱动
-	dbDriver, err := drivers.Get(config.Type)
+	dbDriver, err := driver.Get(config.Type)
 	if err != nil {
 		initErrDB = fmt.Errorf("failed to get database driver: %v", err)
 		return nil, initErrDB
 	}
 
 	// 将内部 DBConfig 转换为 drivers.DBConfig
-	driverConfig := drivers.DBConfig{
+	driverConfig := driver.DBConfig{
 		Type:            config.Type,
 		Host:            config.Host,
 		Port:            config.Port,
@@ -107,7 +107,7 @@ func createDBFactoryNew(config *subconfigs.DatabaseConfig) (*DBFactory, error) {
 	}
 
 	// 测试连接
-	if err := functions.TestConnection(db, config.Type); err != nil {
+	if err := function.TestConnection(db, config.Type); err != nil {
 		db.Close()
 		initErrDB = fmt.Errorf("database connection test failed: %v", err)
 		return nil, initErrDB
@@ -153,54 +153,54 @@ func (f *DBFactory) GetConfig() subconfigs.DatabaseConfig {
 
 // TestConnection 测试连接
 func (f *DBFactory) TestConnection() error {
-	return functions.TestConnection(f.db, f.config.Type)
+	return function.TestConnection(f.db, f.config.Type)
 }
 
 // ========== 快捷操作方法 ==========
 
 // QueryToJSON 快捷查询，直接返回 JSON 字节流
 func (f *DBFactory) QueryToJSON(sql string, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
-	return functions.QueryToJSON(f.db, sql, reqCtx)
+	return function.QueryToJSON(f.db, sql, reqCtx)
 }
 
 // QueryPositionalToJSON 位置参数查询并返回 JSON 字节数据
 func (f *DBFactory) QueryPositionalToJSON(sql string, params []interface{}, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
-	return functions.QueryPositionalToJSON(f.db, sql, params, reqCtx)
+	return function.QueryPositionalToJSON(f.db, sql, params, reqCtx)
 }
 
 // QueryParamsNameToJSON 命名参数查询并返回 JSON 字节数据
 func (f *DBFactory) QueryParamsNameToJSON(sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
-	return functions.QueryParamsNameToJSON(f.db, sql, params, reqCtx)
+	return function.QueryParamsNameToJSON(f.db, sql, params, reqCtx)
 }
 
 // QueryToCSV 快捷查询，直接返回 CSV 字符串（包含表头）
 func (f *DBFactory) QueryToCSV(sql string, writerHeader bool, reqCtx *ctx.RequestContext) ([]byte, error) {
-	return functions.QueryToCSV(f.db, sql, writerHeader, reqCtx)
+	return function.QueryToCSV(f.db, sql, writerHeader, reqCtx)
 }
 
 // QueryPositionalToCSV 位置参数查询并返回 CSV 字节数据
 func (f *DBFactory) QueryPositionalToCSV(sql string, writerHeader bool, params []interface{}, reqCtx *ctx.RequestContext) ([]byte, error) {
-	return functions.QueryPositionalToCSV(f.db, sql, writerHeader, params, reqCtx)
+	return function.QueryPositionalToCSV(f.db, sql, writerHeader, params, reqCtx)
 }
 
 // QueryParamsNameToCSV 命名参数查询并返回 CSV 字节数据
 func (f *DBFactory) QueryParamsNameToCSV(sql string, writerHeader bool, params map[string]interface{}, reqCtx *ctx.RequestContext) ([]byte, error) {
-	return functions.QueryParamsNameToCSV(f.db, sql, writerHeader, params, reqCtx)
+	return function.QueryParamsNameToCSV(f.db, sql, writerHeader, params, reqCtx)
 }
 
 // ExecuteDDL 快捷执行DDL语句
 func (f *DBFactory) ExecuteDDL(ddlSQL string) error {
-	return functions.ExecuteDDL(f.db, ddlSQL)
+	return function.ExecuteDDL(f.db, ddlSQL)
 }
 
 // ExecuteDDLWithTx 快捷在事务中执行DDL语句
 func (f *DBFactory) ExecuteDDLWithTx(ddlSQL string) error {
-	return functions.ExecuteDDLWithTx(f.db, ddlSQL)
+	return function.ExecuteDDLWithTx(f.db, ddlSQL)
 }
 
 // ExecuteMultipleDDL 快捷执行多个DDL语句
 func (f *DBFactory) ExecuteMultipleDDL(ddlSQLs []string) error {
-	return functions.ExecuteMultipleDDL(f.db, ddlSQLs)
+	return function.ExecuteMultipleDDL(f.db, ddlSQLs)
 }
 
 // GetDBType 得到当前使用数据库类型
@@ -240,7 +240,7 @@ func (f *DBFactory) Ping() error {
 
 // GetAvailableDrivers 获取可用的数据库驱动
 func (f *DBFactory) GetAvailableDrivers() []string {
-	return drivers.GetAllDrivers()
+	return driver.GetAllDrivers()
 }
 
 // ========== 新增的简化操作方法 ==========

functions/execute_sql.go → function/execute_sql.go

@@ -1,4 +1,4 @@
-package functions
+package function
 
 import (
 	"fmt"

functions/query_csv.go → function/query_csv.go

@@ -1,4 +1,4 @@
-package functions
+package function
 
 import (
 	"database/sql"

functions/query_json.go → function/query_json.go

@@ -1,4 +1,4 @@
-package functions
+package function
 
 import (
 	"database/sql"

functions/testConnection.go → function/testConnection.go

@@ -1,4 +1,4 @@
-package functions
+package function
 
 import (
 	"fmt"

go.mod

@@ -4,7 +4,7 @@ module git.x2erp.com/qdy/go-db
 go 1.25.4
 
 require (
-	git.x2erp.com/qdy/go-base v0.1.13-20251231-1
+	git.x2erp.com/qdy/go-base v0.1.15
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/lib/pq v1.10.9
 	github.com/microsoft/go-mssqldb v1.9.4
@@ -23,8 +23,8 @@ require (
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
@@ -39,6 +39,6 @@ require (
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/streadway/amqp v1.1.0
 	go.mongodb.org/mongo-driver v1.17.6
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 )

go.sum

@@ -1,7 +1,7 @@
 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.13-20251231-1 h1:lalbX9ZF8oFv2f5OV7Uxc85UGD5lb1M45YS3uSrBCJk=
-git.x2erp.com/qdy/go-base v0.1.13-20251231-1/go.mod h1:bhbWJO4/dxNNjXjie1E0G41pvKEEm2dPnRXRzYnV9tU=
+git.x2erp.com/qdy/go-base v0.1.15 h1:aiboznLQcqIIaM3fjzE6J/N2ZsqANu1hpUI6UZI9YFU=
+git.x2erp.com/qdy/go-base v0.1.15/go.mod h1:L8ZNdgZ6HqcZqIPX9t+bdKFMl33IsnuUCD1KoHIkuIw=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
@@ -96,33 +96,33 @@ go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
 go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=