From 7c5f4f7edc479ff4c85d8fb27e2a59e35bb6562d Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 24 Sep 2019 13:06:46 +0800
Subject: [PATCH] update xorm to fix bug

---
 go.mod                                               |  2 +-
 go.sum                                               |  4 ++--
 vendor/github.com/go-xorm/xorm/session_update.go     |  2 +-
 vendor/github.com/go-xorm/xorm/statement_args.go     |  6 ++++++
 .../github.com/go-xorm/xorm/statement_exprparam.go   | 12 ++++++++++++
 vendor/modules.txt                                   |  2 +-
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index 2c6212d79018..0782aeeb5c1e 100644
--- a/go.mod
+++ b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/go-redis/redis v6.15.2+incompatible
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/go-swagger/go-swagger v0.20.1
-	github.com/go-xorm/xorm v0.7.8-0.20190923153426-6d1191376545
+	github.com/go-xorm/xorm v0.7.8-0.20190924045825-2fbb9cd8ded8
 	github.com/gobwas/glob v0.2.3
 	github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561
 	github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
diff --git a/go.sum b/go.sum
index 403e80de5e4a..82a2161a3701 100644
--- a/go.sum
+++ b/go.sum
@@ -250,8 +250,8 @@ github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.m
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/go-xorm/xorm v0.7.6/go.mod h1:nqz2TAsuOHWH2yk4FYWtacCGgdbrcdZ5mF1XadqEHls=
-github.com/go-xorm/xorm v0.7.8-0.20190923153426-6d1191376545 h1:b3qn2nZKxoG2hsi6cJpSV0ylNJSQfB+nQ9vYL9uxYBU=
-github.com/go-xorm/xorm v0.7.8-0.20190923153426-6d1191376545/go.mod h1:RSsmsVARCy4sayuKWFPaVNQMPYGLNRIK71YIVvgImL0=
+github.com/go-xorm/xorm v0.7.8-0.20190924045825-2fbb9cd8ded8 h1:Tbma//aO945iCTOFHbS/+4FOLtkLnofj+RfHf1nPCog=
+github.com/go-xorm/xorm v0.7.8-0.20190924045825-2fbb9cd8ded8/go.mod h1:RSsmsVARCy4sayuKWFPaVNQMPYGLNRIK71YIVvgImL0=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
diff --git a/vendor/github.com/go-xorm/xorm/session_update.go b/vendor/github.com/go-xorm/xorm/session_update.go
index 402470e5aba4..c5c65a452a17 100644
--- a/vendor/github.com/go-xorm/xorm/session_update.go
+++ b/vendor/github.com/go-xorm/xorm/session_update.go
@@ -245,7 +245,7 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 			if err != nil {
 				return 0, err
 			}
-			colNames = append(colNames, session.engine.Quote(colName)+" = "+subQuery)
+			colNames = append(colNames, session.engine.Quote(colName)+" = ("+subQuery+")")
 			args = append(args, subArgs...)
 		}
 	}
diff --git a/vendor/github.com/go-xorm/xorm/statement_args.go b/vendor/github.com/go-xorm/xorm/statement_args.go
index c6168db1f132..5353ae1add75 100644
--- a/vendor/github.com/go-xorm/xorm/statement_args.go
+++ b/vendor/github.com/go-xorm/xorm/statement_args.go
@@ -17,9 +17,15 @@ func writeArg(w *builder.BytesWriter, arg interface{}) error {
 			return err
 		}
 	case *builder.Builder:
+		if _, err := w.WriteString("("); err != nil {
+			return err
+		}
 		if err := argv.WriteTo(w); err != nil {
 			return err
 		}
+		if _, err := w.WriteString(")"); err != nil {
+			return err
+		}
 	default:
 		if _, err := w.WriteString(fmt.Sprintf("%v", argv)); err != nil {
 			return err
diff --git a/vendor/github.com/go-xorm/xorm/statement_exprparam.go b/vendor/github.com/go-xorm/xorm/statement_exprparam.go
index a72f0aeac9eb..0cddca02450f 100644
--- a/vendor/github.com/go-xorm/xorm/statement_exprparam.go
+++ b/vendor/github.com/go-xorm/xorm/statement_exprparam.go
@@ -60,9 +60,15 @@ func (exprs *exprParams) writeArgs(w *builder.BytesWriter) error {
 	for _, expr := range exprs.args {
 		switch arg := expr.(type) {
 		case *builder.Builder:
+			if _, err := w.WriteString("("); err != nil {
+				return err
+			}
 			if err := arg.WriteTo(w); err != nil {
 				return err
 			}
+			if _, err := w.WriteString(")"); err != nil {
+				return err
+			}
 		default:
 			if _, err := w.WriteString(fmt.Sprintf("%v", arg)); err != nil {
 				return err
@@ -83,9 +89,15 @@ func (exprs *exprParams) writeNameArgs(w *builder.BytesWriter) error {
 
 		switch arg := exprs.args[i].(type) {
 		case *builder.Builder:
+			if _, err := w.WriteString("("); err != nil {
+				return err
+			}
 			if err := arg.WriteTo(w); err != nil {
 				return err
 			}
+			if _, err := w.WriteString("("); err != nil {
+				return err
+			}
 		default:
 			w.Append(exprs.args[i])
 		}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4d8e728c5016..fe27dc03637a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -198,7 +198,7 @@ github.com/go-swagger/go-swagger/cmd/swagger/commands/initcmd
 github.com/go-swagger/go-swagger/codescan
 github.com/go-swagger/go-swagger/generator
 github.com/go-swagger/go-swagger/scan
-# github.com/go-xorm/xorm v0.7.8-0.20190923153426-6d1191376545
+# github.com/go-xorm/xorm v0.7.8-0.20190924045825-2fbb9cd8ded8
 github.com/go-xorm/xorm
 # github.com/gobwas/glob v0.2.3
 github.com/gobwas/glob