Commit 991738ec authored by Amos Wenger's avatar Amos Wenger

Update to latest xorm.io/builder

parent a6700d47
Pipeline #14730 passed with stage
in 23 seconds
......@@ -5,9 +5,9 @@ go 1.12
require (
crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797 // indirect
crawshaw.io/sqlite v0.1.2
github.com/itchio/headway v0.0.0-20190702175331-a4c65c5306de
github.com/itchio/headway v0.0.0-20191015112415-46f64dd4d524
github.com/jinzhu/inflection v1.0.0
github.com/pkg/errors v0.8.1
github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709
xorm.io/builder v0.3.5
xorm.io/builder v0.3.6
)
......@@ -9,6 +9,8 @@ github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
github.com/itchio/headway v0.0.0-20190702175331-a4c65c5306de h1:RQW9xPqYtvjdHHRZR95XsaEA9B4URCuNHK78IuJcc+Y=
github.com/itchio/headway v0.0.0-20190702175331-a4c65c5306de/go.mod h1:Iif+7HeesRB0PvTYf0gOIFX8lj0za0SUsWryENQYt1E=
github.com/itchio/headway v0.0.0-20191015112415-46f64dd4d524 h1:eROPirGQCZXnzRiwJw3bOE4OB5CctMF+zsnH91bmv9o=
github.com/itchio/headway v0.0.0-20191015112415-46f64dd4d524/go.mod h1:Iif+7HeesRB0PvTYf0gOIFX8lj0za0SUsWryENQYt1E=
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
......@@ -22,3 +24,5 @@ github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709 h1:Ko2LQMrRU+Oy
github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
xorm.io/builder v0.3.5 h1:EilU39fvWDxjb1cDaELpYhsF+zziRBhew8xk4pngO+A=
xorm.io/builder v0.3.5/go.mod h1:ZFbByS/KxZI1FKRjL05PyJ4YrK2bcxlUaAxdum5aTR8=
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
......@@ -4,8 +4,8 @@ import (
"reflect"
"crawshaw.io/sqlite"
"xorm.io/builder"
"github.com/pkg/errors"
"xorm.io/builder"
)
type WhereCond interface {
......@@ -24,7 +24,7 @@ func Where(cond builder.Cond) WhereCond {
return whereImpl{cond: cond}
}
func (c *Context) Update(conn *sqlite.Conn, model interface{}, where WhereCond, updates ...builder.Eq) error {
func (c *Context) Update(conn *sqlite.Conn, model interface{}, where WhereCond, updates ...builder.Cond) error {
modelType := reflect.TypeOf(model)
scope := c.ScopeMap.ByType(modelType)
if scope == nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment