Upgrade xorm to v1.0.0 (#10646)

* Upgrade xorm to v1.0.0

* small nit

* Fix tests

* Update xorm

* Update xorm

* fix go.sum

* fix test

* Fix bug when dump

* Fix bug

* update xorm to latest

* Fix migration test

* update xorm to latest

* Fix import order

* Use xorm tag

1 files changed, 1 insertions, 16 deletions

diff --git a/vendor/xorm.io/xorm/session_cond.go b/vendor/xorm.io/xorm/session_cond.go
index b16bdea8e0..25d1714815 100644
--- a/vendor/xorm.io/xorm/session_cond.go
+++ b/vendor/xorm.io/xorm/session_cond.go
@@ -6,14 +6,6 @@ package xorm
 
 import "xorm.io/builder"
 
-// Sql provides raw sql input parameter. When you have a complex SQL statement
-// and cannot use Where, Id, In and etc. Methods to describe, you can use SQL.
-//
-// Deprecated: use SQL instead.
-func (session *Session) Sql(query string, args ...interface{}) *Session {
-	return session.SQL(query, args...)
-}
-
 // SQL provides raw sql input parameter. When you have a complex SQL statement
 // and cannot use Where, Id, In and etc. Methods to describe, you can use SQL.
 func (session *Session) SQL(query interface{}, args ...interface{}) *Session {
@@ -39,13 +31,6 @@ func (session *Session) Or(query interface{}, args ...interface{}) *Session {
 	return session
 }
 
-// Id provides converting id as a query condition
-//
-// Deprecated: use ID instead
-func (session *Session) Id(id interface{}) *Session {
-	return session.ID(id)
-}
-
 // ID provides converting id as a query condition
 func (session *Session) ID(id interface{}) *Session {
 	session.statement.ID(id)
@@ -66,5 +51,5 @@ func (session *Session) NotIn(column string, args ...interface{}) *Session {
 
 // Conds returns session query conditions except auto bean conditions
 func (session *Session) Conds() builder.Cond {
-	return session.statement.cond
+	return session.statement.Conds()
 }