diff --git a/go.mod b/go.mod index 0b48753a3d3..aaf21363f5b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 // Override xorm's outdated go-mssqldb dependency, since we can't upgrade to current xorm (due to breaking changes). // We need a more current go-mssqldb so we get rid of a version of apache/thrift with vulnerabilities. // Also, use our fork with fixes for unimplemented methods (required for Go 1.16). -replace github.com/denisenkom/go-mssqldb => github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036 +replace github.com/denisenkom/go-mssqldb => github.com/grafana/go-mssqldb v0.9.2 // Avoid using v2.0.0+incompatible Redigo used by dependencies as the latest maintained branch of Redigo is v1. replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.9 @@ -44,7 +44,6 @@ require ( github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b github.com/centrifugal/centrifuge v0.25.0 github.com/crewjam/saml v0.4.12 - github.com/denisenkom/go-mssqldb v0.12.0 github.com/fatih/color v1.13.0 github.com/gchaincl/sqlhooks v1.3.0 github.com/getsentry/sentry-go v0.13.0 @@ -269,6 +268,7 @@ require ( github.com/Masterminds/semver/v3 v3.1.1 github.com/dave/dst v0.27.2 github.com/go-jose/go-jose/v3 v3.0.0 + github.com/grafana/go-mssqldb v0.9.1 github.com/grafana/kindsys v0.0.0-20230309200316-812b9884a375 github.com/grafana/thema v0.0.0-20230302221249-6952e4a999b7 github.com/weaveworks/common v0.0.0-20230208133027-16871410fca4 diff --git a/go.sum b/go.sum index 526cea17e50..589fa79a58b 100644 --- a/go.sum +++ b/go.sum @@ -1264,8 +1264,10 @@ github.com/grafana/cuetsy v0.1.6 h1:61QGIDy1rVABU3OkoarOn0+qPdGopIJr34PyWVmGDfs= github.com/grafana/cuetsy v0.1.6/go.mod h1:4KWkUOslwvRTpEv7wdQG0jDFTuJmU+0L9x0h4kWxa2A= github.com/grafana/dskit v0.0.0-20230202092222-880a7f8141cc h1:lQFgXpsZNDdi0whUROW15r/akzLIdXAn6xr5vqlZucI= github.com/grafana/dskit v0.0.0-20230202092222-880a7f8141cc/go.mod h1:ulYLLoSd71AWIjxgifLO86Lndx82Yj+IcV+fFnh8tkI= -github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036 h1:GplhUk6Xes5JIhUUrggPcPBhOn+eT8+WsHiebvq7GgA= -github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/grafana/go-mssqldb v0.9.1 h1:3CqteWF0CadwXV9f3FxoI+i3uSW3azjTlQipyOJtWtQ= +github.com/grafana/go-mssqldb v0.9.1/go.mod h1:HTCsUqZdb7oIO7jc37YauiSB5C3P/13AnpctVWBhlus= +github.com/grafana/go-mssqldb v0.9.2 h1:FkyRJR4ywsT07iMtpFMHStrl8uuNkGIwp253Fee06z8= +github.com/grafana/go-mssqldb v0.9.2/go.mod h1:HTCsUqZdb7oIO7jc37YauiSB5C3P/13AnpctVWBhlus= github.com/grafana/grafana-aws-sdk v0.12.0 h1:eUjFdFZeZE+nyu/RMRz+qFxTBew69ToLBrbRhTbjkfM= github.com/grafana/grafana-aws-sdk v0.12.0/go.mod h1:rCXLYoMpPqF90U7XqgVJ1HIAopFVF0bB3SXBVEJIm3I= github.com/grafana/grafana-azure-sdk-go v1.6.0 h1:lxvH/mVY7gKBtJKhZ4B/6tIZFY7Jth97HxBA38olaxs= diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go index 5838380049f..086bd33c47c 100644 --- a/pkg/tsdb/mssql/mssql.go +++ b/pkg/tsdb/mssql/mssql.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - mssql "github.com/denisenkom/go-mssqldb" + mssql "github.com/grafana/go-mssqldb" "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend/datasource" "github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt" diff --git a/pkg/tsdb/mssql/proxy.go b/pkg/tsdb/mssql/proxy.go index 8b7e8856899..0260ac4339b 100644 --- a/pkg/tsdb/mssql/proxy.go +++ b/pkg/tsdb/mssql/proxy.go @@ -6,7 +6,7 @@ import ( "database/sql/driver" "errors" - mssql "github.com/denisenkom/go-mssqldb" + mssql "github.com/grafana/go-mssqldb" iproxy "github.com/grafana/grafana/pkg/infra/proxy" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/tsdb/sqleng" diff --git a/pkg/tsdb/mssql/proxy_test.go b/pkg/tsdb/mssql/proxy_test.go index b279a538aec..87a3379dd07 100644 --- a/pkg/tsdb/mssql/proxy_test.go +++ b/pkg/tsdb/mssql/proxy_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - mssql "github.com/denisenkom/go-mssqldb" + mssql "github.com/grafana/go-mssqldb" "github.com/grafana/grafana/pkg/infra/proxy/proxyutil" "github.com/stretchr/testify/require" "xorm.io/core"