Skip to content

Commit

Permalink
Merge pull request #84 from DrOctavius/main
Browse files Browse the repository at this point in the history
fixes
  • Loading branch information
DrOctavius authored Oct 14, 2024
2 parents 330b154 + db7da5b commit 1d66d03
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 47 deletions.
6 changes: 3 additions & 3 deletions core/clients/db/dbresolver/dbresolver_convertor.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (dr *DBResolver) convertToConnPoolAvailable(
ConnPool: db.Config.ConnPool,
Stmts: map[string]*gorm.Stmt{},
Mux: &sync.RWMutex{},
PreparedSQL: make([]string, 0, 100),
//PreparedSQL: make([]string, 0, 100),
}

// Gather the connected pools
Expand Down Expand Up @@ -78,7 +78,7 @@ func (dr *DBResolver) convertToDetailedConnPool(
ConnPool: db.Config.ConnPool,
Stmts: map[string]*gorm.Stmt{},
Mux: &sync.RWMutex{},
PreparedSQL: make([]string, 0, 100),
//PreparedSQL: make([]string, 0, 100),
}

connPools = append(connPools, detailedConnPool{
Expand Down Expand Up @@ -107,7 +107,7 @@ func (dr *DBResolver) convertToConnPool(dialectors []gorm.Dialector) (connPools
ConnPool: db.Config.ConnPool,
Stmts: map[string]*gorm.Stmt{},
Mux: &sync.RWMutex{},
PreparedSQL: make([]string, 0, 100),
//PreparedSQL: make([]string, 0, 100),
}

connPools = append(connPools, connPool)
Expand Down
24 changes: 2 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,17 @@ require (
gopkg.in/yaml.v2 v2.4.0
gorm.io/driver/mysql v1.5.0
gorm.io/driver/postgres v1.5.0
gorm.io/gorm v1.25.0
gorm.io/gorm v1.25.12
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.10.0 // indirect
github.com/goccy/go-json v0.9.7 // indirect
github.com/goccy/go-yaml v1.9.5 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
Expand All @@ -72,23 +60,16 @@ require (
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kyaxcorp/gofile v0.0.1-20220602-0002 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/muesli/termenv v0.13.0 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
github.com/richardlehane/mscfb v1.0.4 // indirect
github.com/richardlehane/msoleps v1.0.3 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand All @@ -107,8 +88,7 @@ require (
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/net v0.6.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 1d66d03

Please sign in to comment.