From b7c3959e041fd3d71bc3cedc89506be10675721b Mon Sep 17 00:00:00 2001
From: Yousong Zhou <zhouyousong@yunionyun.com>
Date: Wed, 14 Oct 2020 18:16:46 +0800
Subject: [PATCH] vendor: update yunion.io/x/sqlchemy

---
 go.mod                                |  2 +-
 go.sum                                |  4 ++--
 vendor/modules.txt                    |  2 +-
 vendor/yunion.io/x/sqlchemy/update.go | 16 ++++++++++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 62c9057c5f..336e437810 100644
--- a/go.mod
+++ b/go.mod
@@ -146,7 +146,7 @@ require (
 	yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7
 	yunion.io/x/pkg v0.0.0-20200814072949-4f1b541857d6
 	yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
-	yunion.io/x/sqlchemy v0.0.0-20201009235752-2ef1a29656b0
+	yunion.io/x/sqlchemy v0.0.0-20201014101037-8fe75542e6d8
 	yunion.io/x/structarg v0.0.0-20200720093445-9f850fa222ce
 )
 
diff --git a/go.sum b/go.sum
index 4fd276087f..cec9d3787d 100644
--- a/go.sum
+++ b/go.sum
@@ -1139,7 +1139,7 @@ yunion.io/x/pkg v0.0.0-20200814072949-4f1b541857d6 h1:UarEDTBGkgcgc+nc+PZ75uo9M9
 yunion.io/x/pkg v0.0.0-20200814072949-4f1b541857d6/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
 yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo=
 yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
-yunion.io/x/sqlchemy v0.0.0-20201009235752-2ef1a29656b0 h1:ETDt3Xc3a6WnbHvhrMUemXVsnWY/RgHrsNRCVFWkCYo=
-yunion.io/x/sqlchemy v0.0.0-20201009235752-2ef1a29656b0/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI=
+yunion.io/x/sqlchemy v0.0.0-20201014101037-8fe75542e6d8 h1:AkPrqO37Yi3aICys9qDjTlSdVVGh2pWQ8ET+dSJmhoI=
+yunion.io/x/sqlchemy v0.0.0-20201014101037-8fe75542e6d8/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI=
 yunion.io/x/structarg v0.0.0-20200720093445-9f850fa222ce h1:kU8xE7O5uZ1GSJVMZHoJ+jrNL7csUQHYGyAPW9QfNpE=
 yunion.io/x/structarg v0.0.0-20200720093445-9f850fa222ce/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index f8330bb30b..341b1dcf39 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1109,7 +1109,7 @@ yunion.io/x/pkg/util/workqueue
 yunion.io/x/pkg/utils
 # yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
 yunion.io/x/s3cli
-# yunion.io/x/sqlchemy v0.0.0-20201009235752-2ef1a29656b0
+# yunion.io/x/sqlchemy v0.0.0-20201014101037-8fe75542e6d8
 yunion.io/x/sqlchemy
 # yunion.io/x/structarg v0.0.0-20200720093445-9f850fa222ce
 yunion.io/x/structarg
diff --git a/vendor/yunion.io/x/sqlchemy/update.go b/vendor/yunion.io/x/sqlchemy/update.go
index a122da432a..a606969757 100644
--- a/vendor/yunion.io/x/sqlchemy/update.go
+++ b/vendor/yunion.io/x/sqlchemy/update.go
@@ -21,6 +21,7 @@ import (
 	"reflect"
 	"strings"
 
+	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/gotypes"
@@ -74,14 +75,21 @@ func (ud *SUpdateDiff) String() string {
 		utils.TruncateString(ud.new, 32))
 }
 
+func (ud SUpdateDiff) jsonObj() jsonutils.JSONObject {
+	r := jsonutils.NewDict()
+	r.Set("old", jsonutils.Marshal(ud.old))
+	r.Set("new", jsonutils.Marshal(ud.new))
+	return r
+}
+
 type UpdateDiffs map[string]SUpdateDiff
 
 func (uds UpdateDiffs) String() string {
-	items := make([]string, 0, len(uds))
-	for k, v := range uds {
-		items = append(items, fmt.Sprintf("%s:%s", k, v.String()))
+	obj := jsonutils.NewDict()
+	for k := range uds {
+		obj.Set(k, uds[k].jsonObj())
 	}
-	return strings.Join(items, ";")
+	return obj.String()
 }
 
 func (us *SUpdateSession) saveUpdate(dt interface{}) (UpdateDiffs, error) {