diff options
| author | 6543 <6543@obermui.de> | 2021-02-17 04:47:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 22:47:24 -0500 |
| commit | fe628d8406632e6f5b3969ac86d817a035d4bae9 (patch) | |
| tree | cf29502ba516dcceb6d36c818d6596bfc6715ffd /vendor/xorm.io | |
| parent | dc707aea090741acb48d370152e65aa37d89800b (diff) | |
| download | gitea-fe628d8406632e6f5b3969ac86d817a035d4bae9.tar.gz gitea-fe628d8406632e6f5b3969ac86d817a035d4bae9.zip | |
Vendor Update (#14696)
* github.com/yuin/goldmark v1.3.1 -> v1.3.2
* github.com/xanzy/go-gitlab v0.42.0 -> v0.44.0
* github.com/prometheus/client_golang v1.8.0 -> v1.9.0
* github.com/minio/minio-go v7.0.7 -> v7.0.9
* github.com/lafriks/xormstore v1.3.2 -> v1.4.0
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'vendor/xorm.io')
| -rw-r--r-- | vendor/xorm.io/builder/sql.go | 3 | ||||
| -rw-r--r-- | vendor/xorm.io/xorm/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | vendor/xorm.io/xorm/dialects/mssql.go | 4 | ||||
| -rw-r--r-- | vendor/xorm.io/xorm/schemas/type.go | 7 |
4 files changed, 20 insertions, 1 deletions
diff --git a/vendor/xorm.io/builder/sql.go b/vendor/xorm.io/builder/sql.go index a6d1066b82..60f22621fc 100644 --- a/vendor/xorm.io/builder/sql.go +++ b/vendor/xorm.io/builder/sql.go @@ -59,6 +59,9 @@ func ToBoundSQL(cond interface{}) (string, error) { } func noSQLQuoteNeeded(a interface{}) bool { + if a == nil { + return false + } switch a.(type) { case int, int8, int16, int32, int64: return true diff --git a/vendor/xorm.io/xorm/CHANGELOG.md b/vendor/xorm.io/xorm/CHANGELOG.md index 32403a1a86..3ac229c1ca 100644 --- a/vendor/xorm.io/xorm/CHANGELOG.md +++ b/vendor/xorm.io/xorm/CHANGELOG.md @@ -3,6 +3,13 @@ This changelog goes through all the changes that have been made in each release without substantial changes to our git log. +## [1.0.7](https://gitea.com/xorm/xorm/pulls?q=&type=all&state=closed&milestone=1336) - 2021-01-21 + +* BUGFIXES + * Fix bug for mssql (#1854) +* MISC + * fix_bugs_for_mssql (#1852) + ## [1.0.6](https://gitea.com/xorm/xorm/pulls?q=&type=all&state=closed&milestone=1308) - 2021-01-05 * BUGFIXES diff --git a/vendor/xorm.io/xorm/dialects/mssql.go b/vendor/xorm.io/xorm/dialects/mssql.go index 5340455dd3..083fb65df4 100644 --- a/vendor/xorm.io/xorm/dialects/mssql.go +++ b/vendor/xorm.io/xorm/dialects/mssql.go @@ -220,6 +220,8 @@ type mssql struct { func (db *mssql) Init(uri *URI) error { db.quoter = mssqlQuoter + db.defaultChar = "CHAR" + db.defaultVarchar = "VARCHAR" return db.Base.Init(db, uri) } @@ -538,7 +540,7 @@ WHERE IXS.TYPE_DESC='NONCLUSTERED' and OBJECT_NAME(IXS.OBJECT_ID) =? colName = strings.Trim(colName, "` ") var isRegular bool - if strings.HasPrefix(indexName, "IDX_"+tableName) || strings.HasPrefix(indexName, "UQE_"+tableName) { + if (strings.HasPrefix(indexName, "IDX_"+tableName) || strings.HasPrefix(indexName, "UQE_"+tableName)) && len(indexName) > (5+len(tableName)) { indexName = indexName[5+len(tableName):] isRegular = true } diff --git a/vendor/xorm.io/xorm/schemas/type.go b/vendor/xorm.io/xorm/schemas/type.go index 89459a4de1..f0ede296c7 100644 --- a/vendor/xorm.io/xorm/schemas/type.go +++ b/vendor/xorm.io/xorm/schemas/type.go @@ -68,6 +68,10 @@ func (s *SQLType) IsJson() bool { return s.Name == Json || s.Name == Jsonb } +func (s *SQLType) IsXML() bool { + return s.Name == XML +} + var ( Bit = "BIT" TinyInt = "TINYINT" @@ -128,6 +132,7 @@ var ( Json = "JSON" Jsonb = "JSONB" + XML = "XML" Array = "ARRAY" SqlTypes = map[string]int{ @@ -144,6 +149,8 @@ var ( Json: TEXT_TYPE, Jsonb: TEXT_TYPE, + XML: TEXT_TYPE, + Char: TEXT_TYPE, NChar: TEXT_TYPE, Varchar: TEXT_TYPE, |