mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	upgrade xorm to v1.2.5 (#17177)
This commit is contained in:
		
							
								
								
									
										2
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								go.mod
									
									
									
									
									
								
							@@ -139,7 +139,7 @@ require (
 | 
				
			|||||||
	mvdan.cc/xurls/v2 v2.2.0
 | 
						mvdan.cc/xurls/v2 v2.2.0
 | 
				
			||||||
	strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
 | 
						strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
 | 
				
			||||||
	xorm.io/builder v0.3.9
 | 
						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
 | 
					replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								go.sum
									
									
									
									
									
								
							@@ -1761,5 +1761,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 h1:Sd65/LdWyO7LR8+Cbd+e7mm3sK/7U9k0jS3999IDHMc=
 | 
				
			||||||
xorm.io/builder v0.3.9/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
 | 
					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.0.6/go.mod h1:uF9EtbhODq5kNWxMbnBEj8hRRZnlcNSz2t2N7HW/+A4=
 | 
				
			||||||
xorm.io/xorm v1.2.4 h1:2MQV4wJt4kY6CYJsLxjCLzBen7+aqVxqDTIwfnR59g4=
 | 
					xorm.io/xorm v1.2.5 h1:tqN7OhN8P9xi52qBb76I8m5maAJMz/SSbgK2RGPCPbo=
 | 
				
			||||||
xorm.io/xorm v1.2.4/go.mod h1:fTG8tSjk6O1BYxwuohZUK+S1glnRycsCF05L1qQyEU0=
 | 
					xorm.io/xorm v1.2.5/go.mod h1:fTG8tSjk6O1BYxwuohZUK+S1glnRycsCF05L1qQyEU0=
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								vendor/modules.txt
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/modules.txt
									
									
									
									
										vendored
									
									
								
							@@ -1052,7 +1052,7 @@ strk.kbt.io/projects/go/libravatar
 | 
				
			|||||||
# xorm.io/builder v0.3.9
 | 
					# xorm.io/builder v0.3.9
 | 
				
			||||||
## explicit
 | 
					## explicit
 | 
				
			||||||
xorm.io/builder
 | 
					xorm.io/builder
 | 
				
			||||||
# xorm.io/xorm v1.2.4
 | 
					# xorm.io/xorm v1.2.5
 | 
				
			||||||
## explicit
 | 
					## explicit
 | 
				
			||||||
xorm.io/xorm
 | 
					xorm.io/xorm
 | 
				
			||||||
xorm.io/xorm/caches
 | 
					xorm.io/xorm/caches
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								vendor/xorm.io/xorm/dialects/dialect.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/xorm.io/xorm/dialects/dialect.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -206,7 +206,7 @@ func (db *Base) DropIndexSQL(tableName string, index *schemas.Index) string {
 | 
				
			|||||||
// ModifyColumnSQL returns a SQL to modify SQL
 | 
					// ModifyColumnSQL returns a SQL to modify SQL
 | 
				
			||||||
func (db *Base) ModifyColumnSQL(tableName string, col *schemas.Column) string {
 | 
					func (db *Base) ModifyColumnSQL(tableName string, col *schemas.Column) string {
 | 
				
			||||||
	s, _ := ColumnString(db.dialect, col, false)
 | 
						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
 | 
					// ForUpdateSQL returns for updateSQL
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								vendor/xorm.io/xorm/dialects/mssql.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/xorm.io/xorm/dialects/mssql.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -423,7 +423,7 @@ func (db *mssql) DropTableSQL(tableName string) (string, bool) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
func (db *mssql) ModifyColumnSQL(tableName string, col *schemas.Column) string {
 | 
					func (db *mssql) ModifyColumnSQL(tableName string, col *schemas.Column) string {
 | 
				
			||||||
	s, _ := ColumnString(db.dialect, col, false)
 | 
						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{}) {
 | 
					func (db *mssql) IndexCheckSQL(tableName, idxName string) (string, []interface{}) {
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								vendor/xorm.io/xorm/dialects/postgres.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/xorm.io/xorm/dialects/postgres.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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 {
 | 
					func (db *postgres) ModifyColumnSQL(tableName string, col *schemas.Column) string {
 | 
				
			||||||
	if len(db.getSchema()) == 0 || strings.Contains(tableName, ".") {
 | 
						if len(db.getSchema()) == 0 || strings.Contains(tableName, ".") {
 | 
				
			||||||
		return fmt.Sprintf("alter table %s ALTER COLUMN %s TYPE %s",
 | 
							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",
 | 
						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 {
 | 
					func (db *postgres) DropIndexSQL(tableName string, index *schemas.Index) string {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user