Skip to content

Commit 0e2d046

Browse files
authored
Update xorm (#22094)
1 parent 9745c33 commit 0e2d046

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ require (
105105
gopkg.in/yaml.v3 v3.0.1
106106
mvdan.cc/xurls/v2 v2.4.0
107107
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
108-
xorm.io/builder v0.3.11
109-
xorm.io/xorm v1.3.2-0.20220714055524-c3bce556200f
108+
xorm.io/builder v0.3.12
109+
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830
110110
)
111111

112112
require (
@@ -182,7 +182,7 @@ require (
182182
github.com/go-openapi/strfmt v0.21.3 // indirect
183183
github.com/go-openapi/swag v0.22.3 // indirect
184184
github.com/go-openapi/validate v0.22.0 // indirect
185-
github.com/goccy/go-json v0.9.11 // indirect
185+
github.com/goccy/go-json v0.10.0 // indirect
186186
github.com/gogo/protobuf v1.3.2 // indirect
187187
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
188188
github.com/golang-sql/sqlexp v0.1.0 // indirect

go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,8 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA
599599
github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
600600
github.com/goccy/go-json v0.9.5/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
601601
github.com/goccy/go-json v0.9.6/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
602-
github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
603-
github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
602+
github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
603+
github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
604604
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
605605
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
606606
github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
@@ -2379,7 +2379,7 @@ sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1
23792379
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3FJbP5Cvdq7Khzn6J9OCUQJaBwgBkCR+MOwSs=
23802380
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY=
23812381
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
2382-
xorm.io/builder v0.3.11 h1:naLkJitGyYW7ZZdncsh/JW+HF4HshmvTHTyUyPwJS00=
2383-
xorm.io/builder v0.3.11/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
2384-
xorm.io/xorm v1.3.2-0.20220714055524-c3bce556200f h1:3NvNsM4lnttTsHpk8ODHqrwN1MCEjsO3bD/rpd8A47k=
2385-
xorm.io/xorm v1.3.2-0.20220714055524-c3bce556200f/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=
2382+
xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM=
2383+
xorm.io/builder v0.3.12/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
2384+
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830 h1:ohaHCvT7ocSDkTEa2/2z0BXfINYlHm/Z7IzN7MeXQlM=
2385+
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=

models/db/engine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type Engine interface {
4646
Incr(column string, arg ...interface{}) *xorm.Session
4747
Insert(...interface{}) (int64, error)
4848
Iterate(interface{}, xorm.IterFunc) error
49-
Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *xorm.Session
49+
Join(joinOperator string, tablename, condition interface{}, args ...interface{}) *xorm.Session
5050
SQL(interface{}, ...interface{}) *xorm.Session
5151
Where(interface{}, ...interface{}) *xorm.Session
5252
Asc(colNames ...string) *xorm.Session

0 commit comments

Comments
 (0)