tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-24 18:38:28 +00:00
Code Releases Activity

Upgrade xorm to v1.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) (#16848)

Browse Source 
* Upgrade xorm to v1.2.2 (#16663)

Backport #16663

Fix #16683

* Add test to ensure that dumping of login sources remains correct (#16847)

#16831 has occurred because of a missed regression. This PR adds a simple test to
try to prevent this occuring again.

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
zeripath
2021-08-28 12:16:19 +01:00
committed by GitHub
parent 0c7927fe48
commit 1790f01dd9
135 changed files with 42915 additions and 5428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/xorm.io/xorm/session_schema.go generated vendored
View File

@@ -336,8 +336,10 @@ func (session *Session) Sync2(beans ...interface{}) error {
}
} else {
if !(strings.HasPrefix(curType, expectedType) && curType[len(expectedType)] == '(') {
engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s",
tbNameWithSchema, col.Name, curType, expectedType)
if !strings.EqualFold(schemas.SQLTypeName(curType), engine.dialect.Alias(schemas.SQLTypeName(expectedType))) {
engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s",
tbNameWithSchema, col.Name, curType, expectedType)
}
}
}
} else if expectedType == schemas.Varchar {
@@ -467,7 +469,7 @@ func (session *Session) Import(r io.Reader) ([]sql.Result, error) {
startComment = false
}
} else {
if i > 0 && data[i-1] == '-' && data[i] == '-' {
if !inSingleQuote && i > 0 && data[i-1] == '-' && data[i] == '-' {
startComment = true
continue
}