SongZihuan 1 год назад
Родитель
Сommit
670860b96c

+ 1 - 1
core/stores/sqlc/cachedsql_test.go

@@ -22,11 +22,11 @@ import (
 	"github.com/wuntsong-org/go-zero-plus/core/logx"
 	"github.com/wuntsong-org/go-zero-plus/core/stat"
 	"github.com/wuntsong-org/go-zero-plus/core/stores/cache"
+	"github.com/wuntsong-org/go-zero-plus/core/stores/dbtest"
 	"github.com/wuntsong-org/go-zero-plus/core/stores/redis"
 	"github.com/wuntsong-org/go-zero-plus/core/stores/redis/redistest"
 	"github.com/wuntsong-org/go-zero-plus/core/stores/sqlx"
 	"github.com/wuntsong-org/go-zero-plus/core/syncx"
-	"github.com/wuntsong-org/go-zero-plus/internal/dbtest"
 )
 
 func init() {

+ 1 - 1
core/stores/sqlx/bulkinserter_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/stretchr/testify/assert"
-	"github.com/wuntsong-org/go-zero-plus/internal/dbtest"
+	"github.com/wuntsong-org/go-zero-plus/core/stores/dbtest"
 )
 
 type mockedConn struct {

+ 1 - 1
core/stores/sqlx/orm_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/stretchr/testify/assert"
-	"github.com/wuntsong-org/go-zero-plus/internal/dbtest"
+	"github.com/wuntsong-org/go-zero-plus/core/stores/dbtest"
 )
 
 func TestUnmarshalRowBool(t *testing.T) {

+ 1 - 1
core/stores/sqlx/sqlconn_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/wuntsong-org/go-zero-plus/core/breaker"
 	"github.com/wuntsong-org/go-zero-plus/core/logx"
+	"github.com/wuntsong-org/go-zero-plus/core/stores/dbtest"
 	"github.com/wuntsong-org/go-zero-plus/core/trace/tracetest"
-	"github.com/wuntsong-org/go-zero-plus/internal/dbtest"
 )
 
 const mockedDatasource = "sqlmock"

+ 1 - 1
core/stores/sqlx/tx_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/stretchr/testify/assert"
 	"github.com/wuntsong-org/go-zero-plus/core/breaker"
-	"github.com/wuntsong-org/go-zero-plus/internal/dbtest"
+	"github.com/wuntsong-org/go-zero-plus/core/stores/dbtest"
 )
 
 const (

+ 0 - 1
go.mod

@@ -122,4 +122,3 @@ require (
 )
 
 replace github.com/zeromicro/go-zero => ./
-replace github.com/zeromicro/go-zero/internal/dbtest => ./core/stores/dbtest

+ 1 - 1
tools/goctlwt/go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
 	github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1
-	github.com/wuntsong-org/go-zero-plus v1.0.1
+	github.com/wuntsong-org/go-zero-plus v1.2.1
 	github.com/zeromicro/antlr v0.0.1
 	github.com/zeromicro/ddl-parser v1.0.5
 	golang.org/x/text v0.14.0

+ 1 - 0
tools/goctlwt/go.sum

@@ -169,6 +169,7 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 h1:+dBg5k7nuTE38VVdoroRsT0Z88fmvdYrI2EjzJst35I=
 github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1/go.mod h1:nmuySobZb4kFgFy6BptpXp/BBw+xFSyvVPP6auoJB4k=
 github.com/wuntsong-org/go-zero-plus v1.0.1/go.mod h1:YpodKGBb0wC8K+Qor1Yc9J3BlOfEq8LnqcVrbX5jBo8=
+github.com/wuntsong-org/go-zero-plus v1.2.1/go.mod h1:RWspL3Y+03ifu1zRtOMlvI0sws4lnAWAM3e09IAOlMY=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=