update vendor master 20220702 (#14568)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2022-07-02 10:32:09 +08:00
committed by GitHub
parent bf781bb1db
commit e51dfc470e
4 changed files with 11 additions and 5 deletions

2
go.mod
View File

@@ -105,7 +105,7 @@ require (
yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7
yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
yunion.io/x/sqlchemy v1.1.2-0.20220701113246-498f1b8c1941
yunion.io/x/sqlchemy v1.1.2-0.20220702013738-1246c22e7bd0
yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6
)

4
go.sum
View File

@@ -1135,7 +1135,7 @@ yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e h1:p/Cb7z6gyJbZKnGMeOPL3pTm
yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e/go.mod h1:nYOMflWG1wQC6301rGVglQva9bYbJxHThEJUxRAgMFc=
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 v1.1.2-0.20220701113246-498f1b8c1941 h1:ZSopMA3JfDGhjGw8fBzvxJeu9vAkdwk1tstMmkLfm40=
yunion.io/x/sqlchemy v1.1.2-0.20220701113246-498f1b8c1941/go.mod h1:xXVfJLIxxTRTnPEaVIIoRZXqWyO8+takIOYhc+zO5KE=
yunion.io/x/sqlchemy v1.1.2-0.20220702013738-1246c22e7bd0 h1:3SLS0y2oPKL26HuEgs84I1/a2El3hUILqRCzeyzL/3o=
yunion.io/x/sqlchemy v1.1.2-0.20220702013738-1246c22e7bd0/go.mod h1:xXVfJLIxxTRTnPEaVIIoRZXqWyO8+takIOYhc+zO5KE=
yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6 h1:WuWXhY3DvhdRTzWCJ/kwt3Ss6KIq7+KqJwb+esvNGwU=
yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=

2
vendor/modules.txt vendored
View File

@@ -1483,7 +1483,7 @@ yunion.io/x/pkg/utils
# yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
## explicit; go 1.12
yunion.io/x/s3cli
# yunion.io/x/sqlchemy v1.1.2-0.20220701113246-498f1b8c1941
# yunion.io/x/sqlchemy v1.1.2-0.20220702013738-1246c22e7bd0
## explicit; go 1.17
yunion.io/x/sqlchemy
yunion.io/x/sqlchemy/backends

8
vendor/yunion.io/x/sqlchemy/sql.go generated vendored
View File

@@ -184,7 +184,13 @@ func (db *SDatabase) TxBatchExec(sqlstr string, varsList [][]interface{}) ([]SSq
}
func (db *SDatabase) TxExec(sqlstr string, vars ...interface{}) (sql.Result, error) {
return db.db.Exec(sqlstr, vars...)
results, err := db.TxBatchExec(sqlstr, [][]interface{}{
vars,
})
if err != nil {
return nil, errors.Wrap(err, "db.TxBatchExec")
}
return results[0].Result, results[0].Error
}
func (db *SDatabase) DB() *sql.DB {