public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Use vendored xorm instead of a fork (#77388)

Browse Source 
* use vendored xorm instead of a fork

* bring back mssql driver

* backport azuresql driver

* restore NoAutoTime
This commit is contained in:
Serge Zaitsev
2023-11-06 16:09:49 +01:00
committed by GitHub
parent 7e1110f1f9
commit 5458ea18e7
6 changed files with 588 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+2 -1
View File
@@ -496,7 +496,8 @@ replace github.com/hashicorp/go-hclog => github.com/hashicorp/go-hclog v0.16.1
// happen, for example, during a read when the sqlite db is under heavy write load.
// This patch cherry picks compatible fixes from upstream xorm PR#1998 and can be reverted on upgrade to xorm v1.2.0+.
// This has also been patched to support the azuresql driver that is a thin wrapper for the mssql driver with azure authentication support.
replace xorm.io/xorm => github.com/grafana/xorm v0.8.3-0.20230627081928-d04aa38aa209
//replace xorm.io/xorm => github.com/grafana/xorm v0.8.3-0.20230627081928-d04aa38aa209
replace xorm.io/xorm => ./pkg/util/xorm
// Use our fork of the upstream alertmanagers.
// This is required in order to get notification delivery errors from the receivers API.