aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-11-28 02:11:11 +0800
committerGitHub <noreply@github.com>2020-11-28 02:11:11 +0800
commit99f1b9899f9e6bbe03a2b8345ac2fc0a6b7e237c (patch)
treebf495830822038b3c5f70c590693991bf4112374
parentbee3bebb4ea8e56759100040f1942fc963bc3b96 (diff)
build(deps): bump gorm.io/gorm from 1.20.6 to 1.20.7 (#6425)
* build(deps): bump gorm.io/gorm from 1.20.6 to 1.20.7 Bumps [gorm.io/gorm](https://github.com/go-gorm/gorm) from 1.20.6 to 1.20.7. - [Release notes](https://github.com/go-gorm/gorm/releases) - [Commits](https://github.com/go-gorm/gorm/compare/v1.20.6...v1.20.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix compile error Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: ᴜɴᴋɴᴡᴏɴ <u@gogs.io>
-rw-r--r--go.mod2
-rw-r--r--go.sum2
-rw-r--r--internal/db/db.go5
3 files changed, 4 insertions, 5 deletions
diff --git a/go.mod b/go.mod
index c6af1941..c266cbc4 100644
--- a/go.mod
+++ b/go.mod
@@ -63,7 +63,7 @@ require (
gorm.io/driver/postgres v1.0.5
gorm.io/driver/sqlite v1.1.3
gorm.io/driver/sqlserver v1.0.5
- gorm.io/gorm v1.20.6
+ gorm.io/gorm v1.20.7
unknwon.dev/clog/v2 v2.1.2
xorm.io/builder v0.3.6
xorm.io/core v0.7.2
diff --git a/go.sum b/go.sum
index c05a42c6..b0bc18b4 100644
--- a/go.sum
+++ b/go.sum
@@ -767,6 +767,8 @@ gorm.io/gorm v1.20.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
gorm.io/gorm v1.20.5 h1:g3tpSF9kggASzReK+Z3dYei1IJODLqNUbOjSuCczY8g=
gorm.io/gorm v1.20.5/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
gorm.io/gorm v1.20.6/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.7 h1:rMS4CL3pNmYq1V5/X+nHHjh1Dx6dnf27+Cai5zabo+M=
+gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/internal/db/db.go b/internal/db/db.go
index 739dea68..a0623344 100644
--- a/internal/db/db.go
+++ b/internal/db/db.go
@@ -182,10 +182,7 @@ func Init(w logger.Writer) (*gorm.DB, error) {
conf.UsePostgreSQL = true
case "mysql":
conf.UseMySQL = true
- db = db.Set("gorm:table_options", "ENGINE=InnoDB").
- Session(&gorm.Session{
- WithConditions: true,
- })
+ db = db.Set("gorm:table_options", "ENGINE=InnoDB").Session(&gorm.Session{})
case "sqlite3":
conf.UseSQLite3 = true
case "mssql":