diff options
Diffstat (limited to 'vendor/github.com/denisenkom/go-mssqldb')
| -rw-r--r-- | vendor/github.com/denisenkom/go-mssqldb/appveyor.yml | 37 | ||||
| -rw-r--r-- | vendor/github.com/denisenkom/go-mssqldb/mssql.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/denisenkom/go-mssqldb/tds.go | 6 | ||||
| -rw-r--r-- | vendor/github.com/denisenkom/go-mssqldb/token.go | 12 |
4 files changed, 41 insertions, 16 deletions
diff --git a/vendor/github.com/denisenkom/go-mssqldb/appveyor.yml b/vendor/github.com/denisenkom/go-mssqldb/appveyor.yml index c4d2bb060e..dfcb62de02 100644 --- a/vendor/github.com/denisenkom/go-mssqldb/appveyor.yml +++ b/vendor/github.com/denisenkom/go-mssqldb/appveyor.yml @@ -1,6 +1,7 @@ version: 1.0.{build} -os: Windows Server 2012 R2 +image: + - Visual Studio 2015 clone_folder: c:\gopath\src\github.com\denisenkom\go-mssqldb @@ -9,21 +10,36 @@ environment: HOST: localhost SQLUSER: sa SQLPASSWORD: Password12! - DATABASE: test - GOVERSION: 111 + DATABASE: test + GOVERSION: 113 matrix: - GOVERSION: 18 - SQLINSTANCE: SQL2016 + SQLINSTANCE: SQL2017 - GOVERSION: 19 - SQLINSTANCE: SQL2016 + SQLINSTANCE: SQL2017 - GOVERSION: 110 - SQLINSTANCE: SQL2016 + SQLINSTANCE: SQL2017 - GOVERSION: 111 - SQLINSTANCE: SQL2016 + SQLINSTANCE: SQL2017 + - GOVERSION: 112 + SQLINSTANCE: SQL2017 + - SQLINSTANCE: SQL2017 + - SQLINSTANCE: SQL2016 - SQLINSTANCE: SQL2014 - SQLINSTANCE: SQL2012SP1 - SQLINSTANCE: SQL2008R2SP2 - + + # Go 1.14+ and SQL2019 are available on the Visual Studio 2019 image only + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + GOVERSION: 114 + SQLINSTANCE: SQL2019 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + GOVERSION: 115 + SQLINSTANCE: SQL2019 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + GOVERSION: 115 + SQLINSTANCE: SQL2017 + install: - set GOROOT=c:\go%GOVERSION% - set PATH=%GOPATH%\bin;%GOROOT%\bin;%PATH% @@ -35,15 +51,14 @@ build_script: - go build before_test: - # setup SQL Server - - ps: | + # setup SQL Server + - ps: | $instanceName = $env:SQLINSTANCE Start-Service "MSSQL`$$instanceName" Start-Service "SQLBrowser" - sqlcmd -S "(local)\%SQLINSTANCE%" -Q "Use [master]; CREATE DATABASE test;" - sqlcmd -S "(local)\%SQLINSTANCE%" -h -1 -Q "set nocount on; Select @@version" - pip install codecov - test_script: - go test -race -cpu 4 -coverprofile=coverage.txt -covermode=atomic diff --git a/vendor/github.com/denisenkom/go-mssqldb/mssql.go b/vendor/github.com/denisenkom/go-mssqldb/mssql.go index a74bc7e3fc..25c268edc6 100644 --- a/vendor/github.com/denisenkom/go-mssqldb/mssql.go +++ b/vendor/github.com/denisenkom/go-mssqldb/mssql.go @@ -285,7 +285,7 @@ func (c *Conn) begin(ctx context.Context, tdsIsolation isoLevel) (tx driver.Tx, } tx, err = c.processBeginResponse(ctx) if err != nil { - return nil, c.checkBadConn(err) + return nil, err } return } diff --git a/vendor/github.com/denisenkom/go-mssqldb/tds.go b/vendor/github.com/denisenkom/go-mssqldb/tds.go index 832c4fd23a..67139c6a4a 100644 --- a/vendor/github.com/denisenkom/go-mssqldb/tds.go +++ b/vendor/github.com/denisenkom/go-mssqldb/tds.go @@ -838,6 +838,12 @@ func connect(ctx context.Context, c *Connector, log optionalLogger, p connectPar defer cancel() } // if instance is specified use instance resolution service + if p.instance != "" && p.port != 0 { + // both instance name and port specified + // when port is specified instance name is not used + // you should not provide instance name when you provide port + log.Println("WARN: You specified both instance name and port in the connection string, port will be used and instance name will be ignored"); + } if p.instance != "" && p.port == 0 { p.instance = strings.ToUpper(p.instance) d := c.getDialer(&p) diff --git a/vendor/github.com/denisenkom/go-mssqldb/token.go b/vendor/github.com/denisenkom/go-mssqldb/token.go index 25385e89dc..6aa99aa974 100644 --- a/vendor/github.com/denisenkom/go-mssqldb/token.go +++ b/vendor/github.com/denisenkom/go-mssqldb/token.go @@ -704,14 +704,18 @@ func (ts *parseResp) sendAttention(ch chan tokenStruct) parseRespIter { } func (ts *parseResp) dlog(msg string) { - if ts.sess.logFlags&logDebug != 0 { + // logging from goroutine is disabled to prevent + // data race detection from firing + // The race is probably happening when + // test logger changes between tests. + /*if ts.sess.logFlags&logDebug != 0 { ts.sess.log.Println(msg) - } + }*/ } func (ts *parseResp) dlogf(f string, v ...interface{}) { - if ts.sess.logFlags&logDebug != 0 { + /*if ts.sess.logFlags&logDebug != 0 { ts.sess.log.Printf(f, v...) - } + }*/ } func (ts *parseResp) iter(ctx context.Context, ch chan tokenStruct, tokChan chan tokenStruct) parseRespIter { |