Skip to content

Commit 4563108

Browse files
authored
Support use nvarchar for all varchar columns when using mssql (#12269)
* Support use nvarchar for all varchar columns when using mssql * fix lint * Change DEFAULT_VARCHAR to nvarchar * Remove the config for default varchar since it's unnecessary
1 parent ed8e064 commit 4563108

File tree

11 files changed

+68
-8
lines changed

11 files changed

+68
-8
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,5 @@ require (
120120
mvdan.cc/xurls/v2 v2.1.0
121121
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
122122
xorm.io/builder v0.3.7
123-
xorm.io/xorm v1.0.3
123+
xorm.io/xorm v1.0.4-0.20200718080127-318102c9ff87
124124
)

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -979,5 +979,5 @@ xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
979979
xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
980980
xorm.io/xorm v0.8.0 h1:iALxgJrX8O00f8Jk22GbZwPmxJNgssV5Mv4uc2HL9PM=
981981
xorm.io/xorm v0.8.0/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=
982-
xorm.io/xorm v1.0.3 h1:3dALAohvINu2mfEix5a5x5ZmSVGSljinoSGgvGbaZp0=
983-
xorm.io/xorm v1.0.3/go.mod h1:uF9EtbhODq5kNWxMbnBEj8hRRZnlcNSz2t2N7HW/+A4=
982+
xorm.io/xorm v1.0.4-0.20200718080127-318102c9ff87 h1:vgc2F0wjD0cyrNrSKiIdWu123wuKkPQI84DZUKvJ6ns=
983+
xorm.io/xorm v1.0.4-0.20200718080127-318102c9ff87/go.mod h1:uF9EtbhODq5kNWxMbnBEj8hRRZnlcNSz2t2N7HW/+A4=

models/models.go

+2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ func getEngine() (*xorm.Engine, error) {
145145
}
146146
if setting.Database.Type == "mysql" {
147147
engine.Dialect().SetParams(map[string]string{"rowFormat": "DYNAMIC"})
148+
} else if setting.Database.Type == "mssql" {
149+
engine.Dialect().SetParams(map[string]string{"DEFAULT_VARCHAR": "nvarchar"})
148150
}
149151
engine.SetSchema(setting.Database.Schema)
150152
return engine, nil

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ strk.kbt.io/projects/go/libravatar
916916
# xorm.io/builder v0.3.7
917917
## explicit
918918
xorm.io/builder
919-
# xorm.io/xorm v1.0.3
919+
# xorm.io/xorm v1.0.4-0.20200718080127-318102c9ff87
920920
## explicit
921921
xorm.io/xorm
922922
xorm.io/xorm/caches

vendor/xorm.io/xorm/.drone.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/xorm.io/xorm/Makefile

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/xorm.io/xorm/dialects/mssql.go

+34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/xorm.io/xorm/go.sum

+11-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/xorm.io/xorm/interface.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/xorm.io/xorm/log/logger_context.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/xorm.io/xorm/session.go

+10-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)