upgrade xorm to v1.2.5 (#17177) (#17188)

diff --git a/go.mod b/go.mod
index fd6593c76c393036e67b54c248a14a1fd2b7cc71..3cac5e8079fcea7a7f7c027f01b3040c3a3f8b95 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -139,7 +139,7 @@ require (
        mvdan.cc/xurls/v2 v2.2.0
        strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
        xorm.io/builder v0.3.9
-       xorm.io/xorm v1.2.4
+       xorm.io/xorm v1.2.5
 )
 
 replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1

diff --git a/go.sum b/go.sum
index 150a8f68bd2ac95da5cdb3426f14c0d7636e29d1..d0301701ab671075b924a71d6b98f6b24edcd059 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1765,5 +1765,5 @@ xorm.io/builder v0.3.7/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
 xorm.io/builder v0.3.9 h1:Sd65/LdWyO7LR8+Cbd+e7mm3sK/7U9k0jS3999IDHMc=
 xorm.io/builder v0.3.9/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
 xorm.io/xorm v1.0.6/go.mod h1:uF9EtbhODq5kNWxMbnBEj8hRRZnlcNSz2t2N7HW/+A4=
-xorm.io/xorm v1.2.4 h1:2MQV4wJt4kY6CYJsLxjCLzBen7+aqVxqDTIwfnR59g4=
-xorm.io/xorm v1.2.4/go.mod h1:fTG8tSjk6O1BYxwuohZUK+S1glnRycsCF05L1qQyEU0=
+xorm.io/xorm v1.2.5 h1:tqN7OhN8P9xi52qBb76I8m5maAJMz/SSbgK2RGPCPbo=
+xorm.io/xorm v1.2.5/go.mod h1:fTG8tSjk6O1BYxwuohZUK+S1glnRycsCF05L1qQyEU0=

diff --git a/vendor/modules.txt b/vendor/modules.txt
index 6779534cc584c02e61e53b11988779c18be8a192..0e62e3643a7a2d83b4bfb5185e919405c0e5c6df 100644 (file)
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1047,7 +1047,7 @@ strk.kbt.io/projects/go/libravatar
 # xorm.io/builder v0.3.9
 ## explicit
 xorm.io/builder
-# xorm.io/xorm v1.2.4
+# xorm.io/xorm v1.2.5
 ## explicit
 xorm.io/xorm
 xorm.io/xorm/caches

diff --git a/vendor/xorm.io/xorm/dialects/dialect.go b/vendor/xorm.io/xorm/dialects/dialect.go
index b6c0853ac4a83508c5964ed4474d6c1407aa1a16..c234f19a2f40ade7c46c996cab245208410fd218 100644 (file)
--- a/vendor/xorm.io/xorm/dialects/dialect.go
+++ b/vendor/xorm.io/xorm/dialects/dialect.go
@@ -206,7 +206,7 @@ func (db *Base) DropIndexSQL(tableName string, index *schemas.Index) string {
 // ModifyColumnSQL returns a SQL to modify SQL
 func (db *Base) ModifyColumnSQL(tableName string, col *schemas.Column) string {
        s, _ := ColumnString(db.dialect, col, false)
-       return fmt.Sprintf("ALTER TABLE %s MODIFY COLUMN %s", tableName, s)
+       return fmt.Sprintf("ALTER TABLE %s MODIFY COLUMN %s", db.quoter.Quote(tableName), s)
 }
 
 // ForUpdateSQL returns for updateSQL

diff --git a/vendor/xorm.io/xorm/dialects/mssql.go b/vendor/xorm.io/xorm/dialects/mssql.go
index ab010eb02a37e902f281d789a520878016491047..323c2b8065de48aa41a711b7eb8ca8d67ac2ce2f 100644 (file)
--- a/vendor/xorm.io/xorm/dialects/mssql.go
+++ b/vendor/xorm.io/xorm/dialects/mssql.go
@@ -423,7 +423,7 @@ func (db *mssql) DropTableSQL(tableName string) (string, bool) {
 
 func (db *mssql) ModifyColumnSQL(tableName string, col *schemas.Column) string {
        s, _ := ColumnString(db.dialect, col, false)
-       return fmt.Sprintf("ALTER TABLE %s ALTER COLUMN %s", tableName, s)
+       return fmt.Sprintf("ALTER TABLE %s ALTER COLUMN %s", db.quoter.Quote(tableName), s)
 }
 
 func (db *mssql) IndexCheckSQL(tableName, idxName string) (string, []interface{}) {

diff --git a/vendor/xorm.io/xorm/dialects/postgres.go b/vendor/xorm.io/xorm/dialects/postgres.go
index 6b5a8b2fab25092d2aa09592937a3b41176d0a85..2cc46371ed47a8c580f0c617b20f8444ce8e78fa 100644 (file)
--- a/vendor/xorm.io/xorm/dialects/postgres.go
+++ b/vendor/xorm.io/xorm/dialects/postgres.go
@@ -988,10 +988,10 @@ func (db *postgres) IsTableExist(queryer core.Queryer, ctx context.Context, tabl
 func (db *postgres) ModifyColumnSQL(tableName string, col *schemas.Column) string {
        if len(db.getSchema()) == 0 || strings.Contains(tableName, ".") {
                return fmt.Sprintf("alter table %s ALTER COLUMN %s TYPE %s",
-                       tableName, col.Name, db.SQLType(col))
+                       db.quoter.Quote(tableName), db.quoter.Quote(col.Name), db.SQLType(col))
        }
        return fmt.Sprintf("alter table %s.%s ALTER COLUMN %s TYPE %s",
-               db.getSchema(), tableName, col.Name, db.SQLType(col))
+               db.quoter.Quote(db.getSchema()), db.quoter.Quote(tableName), db.quoter.Quote(col.Name), db.SQLType(col))
 }
 
 func (db *postgres) DropIndexSQL(tableName string, index *schemas.Index) string {