diff --git a/sharedmemory/sharedmemory.go b/sharedmemory/sharedmemory.go deleted file mode 100644 index ce461ad2..00000000 --- a/sharedmemory/sharedmemory.go +++ /dev/null @@ -1,18 +0,0 @@ -package sharedmemory - -import ( - "runtime" - - "github.com/microsoft/go-mssqldb/msdsn" -) - -type sharedMemoryDialer struct{} - -var dialer sharedMemoryDialer = sharedMemoryDialer{} - -func init() { - if runtime.GOOS == "windows" { - msdsn.ProtocolParsers = append(msdsn.ProtocolParsers, dialer) - msdsn.ProtocolDialers["lpc"] = dialer - } -} diff --git a/sharedmemory/sharedmemory_others.go b/sharedmemory/sharedmemory_others.go new file mode 100644 index 00000000..aaf34675 --- /dev/null +++ b/sharedmemory/sharedmemory_others.go @@ -0,0 +1,3 @@ +//go:build !windows || !(amd64 || 386) + +package sharedmemory diff --git a/sharedmemory/sharedmemory_windows.go b/sharedmemory/sharedmemory_windows.go index b02770b8..61e24cad 100644 --- a/sharedmemory/sharedmemory_windows.go +++ b/sharedmemory/sharedmemory_windows.go @@ -1,3 +1,5 @@ +//go:build windows && (amd64 || 386) + package sharedmemory import ( @@ -11,6 +13,8 @@ import ( "github.com/microsoft/go-mssqldb/msdsn" ) +type sharedMemoryDialer struct{} + func (n sharedMemoryDialer) ParseServer(server string, p *msdsn.Config) error { if p.Port > 0 { return fmt.Errorf("Shared memory disallowed due to port being specified") @@ -67,3 +71,9 @@ func (n sharedMemoryDialer) DialConnection(ctx context.Context, p *msdsn.Config) func (n sharedMemoryDialer) CallBrowser(p *msdsn.Config) bool { return false } + +func init() { + dialer := sharedMemoryDialer{} + msdsn.ProtocolParsers = append(msdsn.ProtocolParsers, dialer) + msdsn.ProtocolDialers["lpc"] = dialer +} diff --git a/sharedmemory/stub.go b/sharedmemory/stub.go deleted file mode 100644 index f3164601..00000000 --- a/sharedmemory/stub.go +++ /dev/null @@ -1,37 +0,0 @@ -//go:build !windows -// +build !windows - -package sharedmemory - -import ( - "context" - "fmt" - "net" - - "github.com/microsoft/go-mssqldb/msdsn" -) - -func (n sharedMemoryDialer) ParseServer(server string, p *msdsn.Config) error { - return fmt.Errorf("Shared memory connections are not supported on this operating system") -} - -func (n sharedMemoryDialer) Protocol() string { - return "np" -} - -func (n sharedMemoryDialer) Hidden() bool { - return false -} - -func (n sharedMemoryDialer) ParseBrowserData(data msdsn.BrowserData, p *msdsn.Config) error { - return fmt.Errorf("Shared memory connections are not supported on this operating system") -} - -func (n sharedMemoryDialer) DialConnection(ctx context.Context, p *msdsn.Config) (conn net.Conn, err error) { - - return nil, fmt.Errorf("Shared memory connections are not supported on this operating system") -} - -func (n sharedMemoryDialer) CallBrowser(p *msdsn.Config) bool { - return false -} diff --git a/version.go b/version.go index 19f8b16c..03ececd5 100644 --- a/version.go +++ b/version.go @@ -4,7 +4,7 @@ import "fmt" // Update this variable with the release tag before pushing the tag // This value is written to the prelogin and login7 packets during a new connection -const driverVersion = "v1.9.4" +const driverVersion = "v1.9.5" func getDriverVersion(ver string) uint32 { var majorVersion uint32