Skip to content

Commit 78e5317

Browse files
authored
Update to latest mssqldriver (#7613)
* New driver does not tolerate USE - handle this by closing db and reopening db in the new dbname
1 parent bebc6a3 commit 78e5317

31 files changed

+2372
-594
lines changed

go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module code.gitea.io/gitea
33
go 1.12
44

55
require (
6-
github.com/BurntSushi/toml v0.3.1 // indirect
76
github.com/PuerkitoBio/goquery v0.0.0-20170324135448-ed7d758e9a34
87
github.com/RoaringBitmap/roaring v0.4.7 // indirect
98
github.com/Unknwon/cae v0.0.0-20160715032808-c6aac99ea2ca
@@ -127,11 +126,8 @@ require (
127126
gopkg.in/src-d/go-git.v4 v4.12.0
128127
gopkg.in/stretchr/testify.v1 v1.2.2 // indirect
129128
gopkg.in/testfixtures.v2 v2.5.0
130-
gopkg.in/yaml.v2 v2.2.2 // indirect
131129
mvdan.cc/xurls/v2 v2.0.0
132130
strk.kbt.io/projects/go/libravatar v0.0.0-20160628055650-5eed7bff870a
133131
xorm.io/builder v0.3.5
134132
xorm.io/core v0.6.3
135133
)
136-
137-
replace github.com/denisenkom/go-mssqldb => github.com/denisenkom/go-mssqldb v0.0.0-20180315180555-6a30f4e59a44

go.sum

Lines changed: 57 additions & 2 deletions
Large diffs are not rendered by default.

integrations/migration-test/migration_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,19 @@ func restoreOldDB(t *testing.T, version string) bool {
181181
assert.NoError(t, err)
182182
defer db.Close()
183183

184-
_, err = db.Exec("DROP DATABASE IF EXISTS gitea")
184+
_, err = db.Exec("DROP DATABASE IF EXISTS [gitea]")
185185
assert.NoError(t, err)
186186

187187
statements := strings.Split(data, "\nGO\n")
188188
for _, statement := range statements {
189+
if len(statement) > 5 && statement[:5] == "USE [" {
190+
dbname := statement[5 : len(statement)-1]
191+
db.Close()
192+
db, err = sql.Open("mssql", fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;",
193+
host, port, dbname, models.DbCfg.User, models.DbCfg.Passwd))
194+
assert.NoError(t, err)
195+
defer db.Close()
196+
}
189197
_, err = db.Exec(statement)
190198
assert.NoError(t, err, "Failure whilst running: %s\nError: %v", statement, err)
191199
}

vendor/cloud.google.com/go/AUTHORS

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/CONTRIBUTORS

Lines changed: 40 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/LICENSE

Lines changed: 202 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)