Merge pull request #208 from wubin1989/main

v2.3.6
unionj-cloud · Jun 10, 2024 · e6016a8 · e6016a8
2 parents 7e71c9a + f218f3c
commit e6016a8
Show file tree

Hide file tree

Showing 146 changed files with 1,678 additions and 16,514 deletions.
diff --git a/cmd/internal/ddl/table/ddl.go b/cmd/internal/ddl/table/ddl.go
@@ -6,18 +6,18 @@ import (
 	mapset "github.com/deckarep/golang-set"
 	"github.com/iancoleman/strcase"
 	"github.com/jmoiron/sqlx"
-	"github.com/unionj-cloud/go-doudou/v2/toolkit/envconfig"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
-	"github.com/unionj-cloud/go-doudou/v2/toolkit/astutils"
 	"github.com/unionj-cloud/go-doudou/v2/cmd/internal/ddl/columnenum"
 	"github.com/unionj-cloud/go-doudou/v2/cmd/internal/ddl/config"
 	"github.com/unionj-cloud/go-doudou/v2/cmd/internal/ddl/ddlast"
 	"github.com/unionj-cloud/go-doudou/v2/cmd/internal/ddl/extraenum"
 	"github.com/unionj-cloud/go-doudou/v2/cmd/internal/ddl/sortenum"
+	"github.com/unionj-cloud/go-doudou/v2/toolkit/astutils"
 	"github.com/unionj-cloud/go-doudou/v2/toolkit/caller"
+	"github.com/unionj-cloud/go-doudou/v2/toolkit/envconfig"
 	"github.com/unionj-cloud/go-doudou/v2/toolkit/pathutils"
 	"github.com/unionj-cloud/go-doudou/v2/toolkit/sliceutils"
 	"github.com/unionj-cloud/go-doudou/v2/toolkit/sqlext/wrapper"
@@ -597,12 +597,17 @@ func setupMySQLContainer(logger zerolog.Logger, initdb string, dbname string) (f
 			"MYSQL_ROOT_PASSWORD": "1234",
 			"MYSQL_DATABASE":      dbname,
 		},
-		BindMounts: map[string]string{
-			initdb: "/docker-entrypoint-initdb.d",
-		},
+		Mounts: make(testcontainers.ContainerMounts, 0),
 		WaitingFor: wait.ForLog("port: 3306  MySQL Community Server - GPL").WithStartupTimeout(60 * time.Second),
 	}
 
+	// TODO
+	//req.Mounts = append(req.Mounts, testcontainers.ContainerMount{
+	//	Source:   nil,
+	//	Target:   "/docker-entrypoint-initdb.d",
+	//	ReadOnly: false,
+	//})
+
 	mysqlC, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: req,
 		Started:          true,

diff --git a/cmd/internal/svc/codegen/database/gorm.go b/cmd/internal/svc/codegen/database/gorm.go
@@ -8,11 +8,11 @@ import (
 	"github.com/unionj-cloud/go-doudou/v2/toolkit/gormgen/field"
 	v3 "github.com/unionj-cloud/go-doudou/v2/toolkit/protobuf/v3"
 	"github.com/unionj-cloud/go-doudou/v2/toolkit/stringutils"
-	"gorm.io/driver/mysql"
-	"gorm.io/driver/postgres"
-	"gorm.io/driver/sqlite"
-	"gorm.io/driver/sqlserver"
-	"gorm.io/gorm"
+	"github.com/wubin1989/mysql"
+	"github.com/wubin1989/postgres"
+	"github.com/wubin1989/sqlite"
+	"github.com/wubin1989/sqlserver"
+	"github.com/wubin1989/gorm"
 	"strings"
 )
 
@@ -72,7 +72,7 @@ func (gg *GormGenerator) fix() {
 	//		panic(err)
 	//	}
 	//	fileContent := string(source)
-	//	fileContent = strings.ReplaceAll(fileContent, "gorm.io/gen", "github.com/unionj-cloud/go-doudou/v2/toolkit/gormgen")
+	//	fileContent = strings.ReplaceAll(fileContent, "github.com/wubin1989/gen", "github.com/unionj-cloud/go-doudou/v2/toolkit/gormgen")
 	//	ioutil.WriteFile(file, []byte(fileContent), os.ModePerm)
 	//}
 }
@@ -126,7 +126,7 @@ func (gg *GormGenerator) Initialize(conf OrmGeneratorConfig) {
 		OutPath:       gg.Dir + "/query",
 		Mode:          gormgen.WithDefaultQuery | gormgen.WithQueryInterface,
 		FieldNullable: true,
-		// if you want to assign field which has a default value in the `Create` API, set FieldCoverable true, reference: https://gorm.io/docs/create.html#Default-Values
+		// if you want to assign field which has a default value in the `Create` API, set FieldCoverable true, reference: https://github.com/wubin1989/docs/create.html#Default-Values
 		FieldCoverable: false,
 		// if you want to generate field with unsigned integer type, set FieldSignable true
 		FieldSignable: false,

diff --git a/cmd/internal/templates/mainpkgmod.go b/cmd/internal/templates/mainpkgmod.go
@@ -123,5 +123,5 @@ require (
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gorm.io/gorm v1.25.1-0.20230505075827-e61b98d69677 // indirect
+	github.com/wubin1989/gorm v1.25.1-0.20230505075827-e61b98d69677 // indirect
 )`
diff --git a/framework/config/default.go b/framework/config/default.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"gorm.io/gorm/logger"
+	"github.com/wubin1989/gorm/logger"
 
 	"github.com/unionj-cloud/go-doudou/v2/framework/configmgr"
 )

diff --git a/framework/database/database.go b/framework/database/database.go
@@ -2,20 +2,20 @@ package database
 
 import (
 	gocache "github.com/eko/gocache/lib/v4/cache"
+	"github.com/wubin1989/clickhouse"
+	"github.com/wubin1989/sqlite"
+	"github.com/wubin1989/sqlserver"
 	"log"
 	"os"
 	"strings"
 	"time"
 
-	"gorm.io/driver/clickhouse"
-	"gorm.io/driver/mysql"
-	"gorm.io/driver/postgres"
-	"gorm.io/driver/sqlite"
-	"gorm.io/driver/sqlserver"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-	"gorm.io/plugin/prometheus"
+	"github.com/wubin1989/mysql"
+	"github.com/wubin1989/postgres"
+	"github.com/wubin1989/gorm"
+	"github.com/wubin1989/gorm/logger"
+	"github.com/wubin1989/gorm/schema"
+	"github.com/wubin1989/prometheus"
 
 	"github.com/unionj-cloud/go-doudou/v2/framework/cache"
 	"github.com/unionj-cloud/go-doudou/v2/framework/config"