update mssql drive to last working version 20180314172330-6a30f4e59a44 (#7306)

go.mod

@@ -140,4 +140,4 @@ require (
 	xorm.io/core v0.6.3
 )
 
-replace github.com/denisenkom/go-mssqldb => github.com/denisenkom/go-mssqldb v0.0.0-20161128230840-e32ca5036449
+replace github.com/denisenkom/go-mssqldb => github.com/denisenkom/go-mssqldb v0.0.0-20180314172330-6a30f4e59a44

go.sum

@@ -60,8 +60,8 @@ github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20161128230840-e32ca5036449 h1:JpA+YMG4JLW8nzLmU05mTiuB0O17xHGxpWolEZ0zDuA=
-github.com/denisenkom/go-mssqldb v0.0.0-20161128230840-e32ca5036449/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
+github.com/denisenkom/go-mssqldb v0.0.0-20180314172330-6a30f4e59a44 h1:x0uHqLQTSEL9LKic8sWDt3ASkq07ve5ojIIUl5uF64M=
+github.com/denisenkom/go-mssqldb v0.0.0-20180314172330-6a30f4e59a44/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
 github.com/dgrijalva/jwt-go v0.0.0-20161101193935-9ed569b5d1ac h1:xrQJVwQCGqDvOO7/0+RyIq5J2M3Q4ZF7Ug/BMQtML1E=
 github.com/dgrijalva/jwt-go v0.0.0-20161101193935-9ed569b5d1ac/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 h1:aaQcKT9WumO6JEJcRyTqFVq4XUZiUcKR2/GI31TOcz8=

vendor/github.com/denisenkom/go-mssqldb/README.md

@@ -1,79 +1,131 @@
 # A pure Go MSSQL driver for Go's database/sql package
 
+[![GoDoc](https://godoc.org/github.com/denisenkom/go-mssqldb?status.svg)](http://godoc.org/github.com/denisenkom/go-mssqldb)
+[![Build status](https://ci.appveyor.com/api/projects/status/jrln8cs62wj9i0a2?svg=true)](https://ci.appveyor.com/project/denisenkom/go-mssqldb)
+[![codecov](https://codecov.io/gh/denisenkom/go-mssqldb/branch/master/graph/badge.svg)](https://codecov.io/gh/denisenkom/go-mssqldb)
+
 ## Install
 
-    go get github.com/denisenkom/go-mssqldb
+Requires Go 1.8 or above.
 
-## Tests
+Install with `go get github.com/denisenkom/go-mssqldb` .
 
-`go test` is used for testing. A running instance of MSSQL server is required.
-Environment variables are used to pass login information.
+## Connection Parameters and DSN
 
-Example:
+The recommended connection string uses a URL format:
+`sqlserver://username:password@host/instance?param1=value&param2=value`
+Other supported formats are listed below.
 
-    env HOST=localhost SQLUSER=sa SQLPASSWORD=sa DATABASE=test go test
+### Common parameters:
 
-## Connection Parameters
+* `user id` - enter the SQL Server Authentication user id or the Windows Authentication user id in the DOMAIN\User format. On Windows, if user id is empty or missing Single-Sign-On is used.
+* `password`
+* `database`
+* `connection timeout` - in seconds (default is 30)
+* `dial timeout` - in seconds (default is 5)
+* `encrypt`
+  * `disable` - Data send between client and server is not encrypted.
+  * `false` - Data sent between client and server is not encrypted beyond the login packet. (Default)
+  * `true` - Data sent between client and server is encrypted.
+* `keepAlive` - in seconds; 0 to disable (default is 30)
+* `app name` - The application name (default is go-mssqldb)
 
-* "server" - host or host\instance (default localhost)
-* "port" - used only when there is no instance in server (default 1433)
-* "failoverpartner" - host or host\instance (default is no partner). 
-* "failoverport" - used only when there is no instance in failoverpartner (default 1433)
-* "user id" - enter the SQL Server Authentication user id or the Windows Authentication user id in the DOMAIN\User format. On Windows, if user id is empty or missing Single-Sign-On is used.
-* "password"
-* "database"
-* "connection timeout" - in seconds (default is 30)
-* "dial timeout" - in seconds (default is 5)
-* "keepAlive" - in seconds; 0 to disable (default is 0)
-* "log" - logging flags (default 0/no logging, 63 for full logging)
+### Connection parameters for ODBC and ADO style connection strings:
+
+* `server` - host or host\instance (default localhost)
+* `port` - used only when there is no instance in server (default 1433)
+
+### Less common parameters:
+
+* `failoverpartner` - host or host\instance (default is no partner). 
+* `failoverport` - used only when there is no instance in failoverpartner (default 1433)
+* `packet size` - in bytes; 512 to 32767 (default is 4096)
+  * Encrypted connections have a maximum packet size of 16383 bytes
+  * Further information on usage: https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/configure-the-network-packet-size-server-configuration-option
+* `log` - logging flags (default 0/no logging, 63 for full logging)
   *  1 log errors
   *  2 log messages
   *  4 log rows affected
   *  8 trace sql statements
   * 16 log statement parameters
   * 32 log transaction begin/end
-* "encrypt"
-  * disable - Data send between client and server is not encrypted.
-  * false - Data sent between client and server is not encrypted beyond the login packet. (Default)
-  * true - Data sent between client and server is encrypted.
-* "TrustServerCertificate"
+* `TrustServerCertificate`
   * false - Server certificate is checked. Default is false if encypt is specified.
   * true - Server certificate is not checked. Default is true if encrypt is not specified. If trust server certificate is true, driver accepts any certificate presented by the server and any host name in that certificate. In this mode, TLS is susceptible to man-in-the-middle attacks. This should be used only for testing.
-* "certificate" - The file that contains the public key certificate of the CA that signed the SQL Server certificate. The specified certificate overrides the go platform specific CA certificates.
-* "hostNameInCertificate" - Specifies the Common Name (CN) in the server certificate. Default value is the server host.
-* "ServerSPN" - The kerberos SPN (Service Principal Name) for the server. Default is MSSQLSvc/host:port.
-* "Workstation ID" - The workstation name (default is the host name)
-* "app name" - The application name (default is go-mssqldb)
-* "ApplicationIntent" - Can be given the value "ReadOnly" to initiate a read-only connection to an Availability Group listener.
+* `certificate` - The file that contains the public key certificate of the CA that signed the SQL Server certificate. The specified certificate overrides the go platform specific CA certificates.
+* `hostNameInCertificate` - Specifies the Common Name (CN) in the server certificate. Default value is the server host.
+* `ServerSPN` - The kerberos SPN (Service Principal Name) for the server. Default is MSSQLSvc/host:port.
+* `Workstation ID` - The workstation name (default is the host name)
+* `ApplicationIntent` - Can be given the value `ReadOnly` to initiate a read-only connection to an Availability Group listener.
 
-Example:
+### The connection string can be specified in one of three formats:
+
+
+1. URL: with `sqlserver` scheme. username and password appears before the host. Any instance appears as
+    the first segment in the path. All other options are query parameters. Examples:
+
+  * `sqlserver://username:password@host/instance?param1=value&param2=value`
+  * `sqlserver://username:password@host:port?param1=value&param2=value`
+  * `sqlserver://sa@localhost/SQLExpress?database=master&connection+timeout=30` // `SQLExpress instance.
+  * `sqlserver://sa:mypass@localhost?database=master&connection+timeout=30`     // username=sa, password=mypass.
+  * `sqlserver://sa:mypass@localhost:1234?database=master&connection+timeout=30"` // port 1234 on localhost.
+  * `sqlserver://sa:my%7Bpass@somehost?connection+timeout=30` // password is "my{pass"
+
+  A string of this format can be constructed using the `URL` type in the `net/url` package.
 
 ```go
-    db, err := sql.Open("mssql", "server=localhost;user id=sa")
+  query := url.Values{}
+  query.Add("connection timeout", "30")
+
+  u := &url.URL{
+      Scheme:   "sqlserver",
+      User:     url.UserPassword(username, password),
+      Host:     fmt.Sprintf("%s:%d", hostname, port),
+      // Path:  instance, // if connecting to an instance instead of a port
+      RawQuery: query.Encode(),
+  }
+  db, err := sql.Open("sqlserver", u.String())
+```
+
+2. ADO: `key=value` pairs separated by `;`. Values may not contain `;`, leading and trailing whitespace is ignored.
+     Examples:
+	
+  * `server=localhost\\SQLExpress;user id=sa;database=master;connection timeout=30`
+  * `server=localhost;user id=sa;database=master;connection timeout=30`
+
+3. ODBC: Prefix with `odbc`, `key=value` pairs separated by `;`. Allow `;` by wrapping
+    values in `{}`. Examples:
+	
+  * `odbc:server=localhost\\SQLExpress;user id=sa;database=master;connection timeout=30`
+  * `odbc:server=localhost;user id=sa;database=master;connection timeout=30`
+  * `odbc:server=localhost;user id=sa;password={foo;bar}` // Value marked with `{}`, password is "foo;bar"
+  * `odbc:server=localhost;user id=sa;password={foo{bar}` // Value marked with `{}`, password is "foo{bar"
+  * `odbc:server=localhost;user id=sa;password={foobar }` // Value marked with `{}`, password is "foobar "
+  * `odbc:server=localhost;user id=sa;password=foo{bar`   // Literal `{`, password is "foo{bar"
+  * `odbc:server=localhost;user id=sa;password=foo}bar`   // Literal `}`, password is "foo}bar"
+  * `odbc:server=localhost;user id=sa;password={foo{bar}` // Literal `{`, password is "foo{bar"
+  * `odbc:server=localhost;user id=sa;password={foo}}bar}` // Escaped `} with `}}`, password is "foo}bar"
+
+## Executing Stored Procedures
+
+To run a stored procedure, set the query text to the procedure name:
+```go
+var account = "abc"
+_, err := db.ExecContext(ctx, "sp_RunMe",
+	sql.Named("ID", 123),
+	sql.Out{Dest{sql.Named("Account", &account)}
+)
 ```
 
 ## Statement Parameters
 
-In the SQL statement text, literals may be replaced by a parameter that matches one of the following:
-
-* ?
-* ?nnn
-* :nnn
-* $nnn
-
-where nnn represents an integer that specifies a 1-indexed positional parameter. Ex:
+The `sqlserver` driver uses normal MS SQL Server syntax and expects parameters in
+the sql query to be in the form of either `@Name` or `@p1` to `@pN` (ordinal position).
 
 ```go
-db.Query("SELECT * FROM t WHERE a = ?3, b = ?2, c = ?1", "x", "y", "z")
+db.QueryContext(ctx, `select * from t where ID = @ID and Name = @p2;`, sql.Named("ID", 6), "Bob")
 ```
 
-will expand to roughly
-
-```sql
-SELECT * FROM t WHERE a = 'z', b = 'y', c = 'x'
-```
-
-
 ## Features
 
 * Can be used with SQL Server 2005 or newer
@@ -87,6 +139,34 @@ SELECT * FROM t WHERE a = 'z', b = 'y', c = 'x'
 * Supports connections to AlwaysOn Availability Group listeners, including re-direction to read-only replicas.
 * Supports query notifications
 
+## Tests
+
+`go test` is used for testing. A running instance of MSSQL server is required.
+Environment variables are used to pass login information.
+
+Example:
+
+    env SQLSERVER_DSN=sqlserver://user:pass@hostname/instance?database=test1 go test
+
+## Deprecated
+
+These features still exist in the driver, but they are are deprecated.
+
+### Query Parameter Token Replace (driver "mssql")
+
+If you use the driver name "mssql" (rather then "sqlserver" the SQL text
+will be loosly parsed and an attempt to extract identifiers using one of
+
+* ?
+* ?nnn
+* :nnn
+* $nnn
+
+will be used. This is not recommended with SQL Server. 
+There is at least one existing `won't fix` issue with the query parsing.
+
+Use the native "@Name" parameters instead with the "sqlserver" driver name.
+
 ## Known Issues
 
 * SQL Server 2008 and 2008 R2 engine cannot handle login records when SSL encryption is not disabled.

vendor/github.com/denisenkom/go-mssqldb/appveyor.yml

@@ -0,0 +1,45 @@
+version: 1.0.{build}
+
+os: Windows Server 2012 R2
+
+clone_folder: c:\gopath\src\github.com\denisenkom\go-mssqldb
+
+environment:
+  GOPATH: c:\gopath
+  HOST: localhost
+  SQLUSER: sa
+  SQLPASSWORD: Password12!
+  DATABASE: test  
+  GOVERSION: 110
+  matrix:
+    - GOVERSION: 18
+      SQLINSTANCE: SQL2016
+    - GOVERSION: 110
+      SQLINSTANCE: SQL2016
+    - SQLINSTANCE: SQL2014
+    - SQLINSTANCE: SQL2012SP1
+    - SQLINSTANCE: SQL2008R2SP2
+ 
+install:
+  - set GOROOT=c:\go%GOVERSION%
+  - set PATH=%GOPATH%\bin;%GOROOT%\bin;%PATH%
+  - go version
+  - go env
+
+build_script:
+  - go build
+
+before_test:
+  # 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 -coverprofile=coverage.txt -covermode=atomic
+  - codecov -f coverage.txt

vendor/github.com/denisenkom/go-mssqldb/buf.go

@@ -2,12 +2,14 @@ package mssql
 
 import (
 	"encoding/binary"
-	"io"
 	"errors"
+	"io"
 )
 
+type packetType uint8
+
 type header struct {
-	PacketType uint8
+	PacketType packetType
 	Status     uint8
 	Size       uint16
 	Spid       uint16
@@ -15,55 +17,84 @@ type header struct {
 	Pad        uint8
 }
 
+// tdsBuffer reads and writes TDS packets of data to the transport.
+// The write and read buffers are separate to make sending attn signals
+// possible without locks. Currently attn signals are only sent during
+// reads, not writes.
 type tdsBuffer struct {
-	buf         []byte
-	pos         uint16
-	transport   io.ReadWriteCloser
-	size        uint16
+	transport io.ReadWriteCloser
+
+	packetSize int
+
+	// Write fields.
+	wbuf        []byte
+	wpos        int
+	wPacketSeq  byte
+	wPacketType packetType
+
+	// Read fields.
+	rbuf        []byte
+	rpos        int
+	rsize       int
 	final       bool
-	packet_type uint8
-	afterFirst  func()
+	rPacketType packetType
+
+	// afterFirst is assigned to right after tdsBuffer is created and
+	// before the first use. It is executed after the first packet is
+	// written and then removed.
+	afterFirst func()
 }
 
-func newTdsBuffer(bufsize int, transport io.ReadWriteCloser) *tdsBuffer {
-	buf := make([]byte, bufsize)
-	w := new(tdsBuffer)
-	w.buf = buf
-	w.pos = 8
-	w.transport = transport
-	w.size = 0
-	return w
+func newTdsBuffer(bufsize uint16, transport io.ReadWriteCloser) *tdsBuffer {
+	return &tdsBuffer{
+		packetSize: int(bufsize),
+		wbuf:       make([]byte, 1<<16),
+		rbuf:       make([]byte, 1<<16),
+		rpos:       8,
+		transport:  transport,
+	}
+}
+
+func (rw *tdsBuffer) ResizeBuffer(packetSize int) {
+	rw.packetSize = packetSize
+}
+
+func (w *tdsBuffer) PackageSize() int {
+	return w.packetSize
 }
 
 func (w *tdsBuffer) flush() (err error) {
-	// writing packet size
-	binary.BigEndian.PutUint16(w.buf[2:], w.pos)
+	// Write packet size.
+	w.wbuf[0] = byte(w.wPacketType)
+	binary.BigEndian.PutUint16(w.wbuf[2:], uint16(w.wpos))
+	w.wbuf[6] = w.wPacketSeq
 
-	// writing packet into underlying transport
-	if _, err = w.transport.Write(w.buf[:w.pos]); err != nil {
+	// Write packet into underlying transport.
+	if _, err = w.transport.Write(w.wbuf[:w.wpos]); err != nil {
 		return err
 	}
+	// It is possible to create a whole new buffer after a flush.
+	// Useful for debugging. Normally reuse the buffer.
+	// w.wbuf = make([]byte, 1<<16)
 
-	// execute afterFirst hook if it is set
+	// Execute afterFirst hook if it is set.
 	if w.afterFirst != nil {
 		w.afterFirst()
 		w.afterFirst = nil
 	}
 
-	w.pos = 8
-	// packet number
-	w.buf[6] += 1
+	w.wpos = 8
+	w.wPacketSeq++
 	return nil
 }
 
 func (w *tdsBuffer) Write(p []byte) (total int, err error) {
-	total = 0
 	for {
-		copied := copy(w.buf[w.pos:], p)
-		w.pos += uint16(copied)
+		copied := copy(w.wbuf[w.wpos:w.packetSize], p)
+		w.wpos += copied
 		total += copied
 		if copied == len(p) {
-			break
+			return
 		}
 		if err = w.flush(); err != nil {
 			return
@@ -74,66 +105,64 @@ func (w *tdsBuffer) Write(p []byte) (total int, err error) {
 }
 
 func (w *tdsBuffer) WriteByte(b byte) error {
-	if int(w.pos) == len(w.buf) {
+	if int(w.wpos) == len(w.wbuf) {
 		if err := w.flush(); err != nil {
 			return err
 		}
 	}
-	w.buf[w.pos] = b
-	w.pos += 1
+	w.wbuf[w.wpos] = b
+	w.wpos += 1
 	return nil
 }
 
-func (w *tdsBuffer) BeginPacket(packet_type byte) {
-	w.buf[0] = packet_type
-	w.buf[1] = 0 // packet is incomplete
-	w.buf[4] = 0 // spid
-	w.buf[5] = 0
-	w.buf[6] = 1 // packet id
-	w.buf[7] = 0 // window
-	w.pos = 8
+func (w *tdsBuffer) BeginPacket(packetType packetType) {
+	w.wbuf[1] = 0 // Packet is incomplete. This byte is set again in FinishPacket.
+	w.wpos = 8
+	w.wPacketSeq = 1
+	w.wPacketType = packetType
 }
 
 func (w *tdsBuffer) FinishPacket() error {
-	w.buf[1] = 1 // this is last packet
+	w.wbuf[1] = 1 // Mark this as the last packet in the message.
 	return w.flush()
 }
 
+var headerSize = binary.Size(header{})
+
 func (r *tdsBuffer) readNextPacket() error {
-	header := header{}
+	h := header{}
 	var err error
-	err = binary.Read(r.transport, binary.BigEndian, &header)
+	err = binary.Read(r.transport, binary.BigEndian, &h)
 	if err != nil {
 		return err
 	}
-	offset := uint16(binary.Size(header))
-	if int(header.Size) > len(r.buf) {
+	if int(h.Size) > len(r.rbuf) {
 		return errors.New("Invalid packet size, it is longer than buffer size")
 	}
-	if int(offset) > int(header.Size) {
+	if headerSize > int(h.Size) {
 		return errors.New("Invalid packet size, it is shorter than header size")
 	}
-	_, err = io.ReadFull(r.transport, r.buf[offset:header.Size])
+	_, err = io.ReadFull(r.transport, r.rbuf[headerSize:h.Size])
 	if err != nil {
 		return err
 	}
-	r.pos = offset
-	r.size = header.Size
-	r.final = header.Status != 0
-	r.packet_type = header.PacketType
+	r.rpos = headerSize
+	r.rsize = int(h.Size)
+	r.final = h.Status != 0
+	r.rPacketType = h.PacketType
 	return nil
 }
 
-func (r *tdsBuffer) BeginRead() (uint8, error) {
+func (r *tdsBuffer) BeginRead() (packetType, error) {
 	err := r.readNextPacket()
 	if err != nil {
 		return 0, err
 	}
-	return r.packet_type, nil
+	return r.rPacketType, nil
 }
 
 func (r *tdsBuffer) ReadByte() (res byte, err error) {
-	if r.pos == r.size {
+	if r.rpos == r.rsize {
 		if r.final {
 			return 0, io.EOF
 		}
@@ -142,8 +171,8 @@ func (r *tdsBuffer) ReadByte() (res byte, err error) {
 			return 0, err
 		}
 	}
-	res = r.buf[r.pos]
-	r.pos++
+	res = r.rbuf[r.rpos]
+	r.rpos++
 	return res, nil
 }
 
@@ -207,7 +236,7 @@ func (r *tdsBuffer) readUcs2(numchars int) string {
 func (r *tdsBuffer) Read(buf []byte) (copied int, err error) {
 	copied = 0
 	err = nil
-	if r.pos == r.size {
+	if r.rpos == r.rsize {
 		if r.final {
 			return 0, io.EOF
 		}
@@ -216,7 +245,7 @@ func (r *tdsBuffer) Read(buf []byte) (copied int, err error) {
 			return
 		}
 	}
-	copied = copy(buf, r.buf[r.pos:r.size])
-	r.pos += uint16(copied)
+	copied = copy(buf, r.rbuf[r.rpos:r.rsize])
+	r.rpos += copied
 	return
 }

vendor/github.com/denisenkom/go-mssqldb/bulkcopy_sql.go

@@ -0,0 +1,93 @@
+package mssql
+
+import (
+	"context"
+	"database/sql/driver"
+	"encoding/json"
+	"errors"
+)
+
+type copyin struct {
+	cn       *Conn
+	bulkcopy *Bulk
+	closed   bool
+}
+
+type serializableBulkConfig struct {
+	TableName   string
+	ColumnsName []string
+	Options     BulkOptions
+}
+
+func (d *Driver) OpenConnection(dsn string) (*Conn, error) {
+	return d.open(context.Background(), dsn)
+}
+
+func (c *Conn) prepareCopyIn(query string) (_ driver.Stmt, err error) {
+	config_json := query[11:]
+
+	bulkconfig := serializableBulkConfig{}
+	err = json.Unmarshal([]byte(config_json), &bulkconfig)
+	if err != nil {
+		return
+	}
+
+	bulkcopy := c.CreateBulk(bulkconfig.TableName, bulkconfig.ColumnsName)
+	bulkcopy.Options = bulkconfig.Options
+
+	ci := &copyin{
+		cn:       c,
+		bulkcopy: bulkcopy,
+	}
+
+	return ci, nil
+}
+
+func CopyIn(table string, options BulkOptions, columns ...string) string {
+	bulkconfig := &serializableBulkConfig{TableName: table, Options: options, ColumnsName: columns}
+
+	config_json, err := json.Marshal(bulkconfig)
+	if err != nil {
+		panic(err)
+	}
+
+	stmt := "INSERTBULK " + string(config_json)
+
+	return stmt
+}
+
+func (ci *copyin) NumInput() int {
+	return -1
+}
+
+func (ci *copyin) Query(v []driver.Value) (r driver.Rows, err error) {
+	return nil, errors.New("ErrNotSupported")
+}
+
+func (ci *copyin) Exec(v []driver.Value) (r driver.Result, err error) {
+	if ci.closed {
+		return nil, errors.New("errCopyInClosed")
+	}
+
+	if len(v) == 0 {
+		rowCount, err := ci.bulkcopy.Done()
+		ci.closed = true
+		return driver.RowsAffected(rowCount), err
+	}
+
+	t := make([]interface{}, len(v))
+	for i, val := range v {
+		t[i] = val
+	}
+
+	err = ci.bulkcopy.AddRow(t)
+	if err != nil {
+		return
+	}
+
+	return driver.RowsAffected(0), nil
+}
+
+func (ci *copyin) Close() (err error) {
+	return nil
+}

vendor/github.com/denisenkom/go-mssqldb/collation.go

@@ -1,39 +0,0 @@
-package mssql
-
-import (
-	"encoding/binary"
-	"io"
-)
-
-// http://msdn.microsoft.com/en-us/library/dd340437.aspx
-
-type collation struct {
-	lcidAndFlags uint32
-	sortId       uint8
-}
-
-func (c collation) getLcid() uint32 {
-	return c.lcidAndFlags & 0x000fffff
-}
-
-func (c collation) getFlags() uint32 {
-	return (c.lcidAndFlags & 0x0ff00000) >> 20
-}
-
-func (c collation) getVersion() uint32 {
-	return (c.lcidAndFlags & 0xf0000000) >> 28
-}
-
-func readCollation(r *tdsBuffer) (res collation) {
-	res.lcidAndFlags = r.uint32()
-	res.sortId = r.byte()
-	return
-}
-
-func writeCollation(w io.Writer, col collation) (err error) {
-	if err = binary.Write(w, binary.LittleEndian, col.lcidAndFlags); err != nil {
-		return
-	}
-	err = binary.Write(w, binary.LittleEndian, col.sortId)
-	return
-}

vendor/github.com/denisenkom/go-mssqldb/decimal.go

@@ -32,7 +32,13 @@ func (d Decimal) ToFloat64() float64 {
 	return val
 }
 
+const autoScale = 100
+
 func Float64ToDecimal(f float64) (Decimal, error) {
+	return Float64ToDecimalScale(f, autoScale)
+}
+
+func Float64ToDecimalScale(f float64, scale uint8) (Decimal, error) {
 	var dec Decimal
 	if math.IsNaN(f) {
 		return dec, errors.New("NaN")
@@ -49,10 +55,10 @@ func Float64ToDecimal(f float64) (Decimal, error) {
 	}
 	dec.prec = 20
 	var integer float64
-	for dec.scale = 0; dec.scale <= 20; dec.scale++ {
+	for dec.scale = 0; dec.scale <= scale; dec.scale++ {
 		integer = f * scaletblflt64[dec.scale]
 		_, frac := math.Modf(integer)
-		if frac == 0 {
+		if frac == 0 && scale == autoScale {
 			break
 		}
 	}
@@ -73,7 +79,7 @@ func init() {
 	}
 }
 
-func (d Decimal) Bytes() []byte {
+func (d Decimal) BigInt() big.Int {
 	bytes := make([]byte, 16)
 	binary.BigEndian.PutUint32(bytes[0:4], d.integer[3])
 	binary.BigEndian.PutUint32(bytes[4:8], d.integer[2])
@@ -84,9 +90,19 @@ func (d Decimal) Bytes() []byte {
 	if !d.positive {
 		x.Neg(&x)
 	}
+	return x
+}
+
+func (d Decimal) Bytes() []byte {
+	x := d.BigInt()
 	return scaleBytes(x.String(), d.scale)
 }
 
+func (d Decimal) UnscaledBytes() []byte {
+	x := d.BigInt()
+	return x.Bytes()
+}
+
 func scaleBytes(s string, scale uint8) []byte {
 	z := make([]byte, 0, len(s)+1)
 	if s[0] == '-' || s[0] == '+' {

vendor/github.com/denisenkom/go-mssqldb/doc.go

@@ -0,0 +1,12 @@
+// package mssql implements the TDS protocol used to connect to MS SQL Server (sqlserver)
+// database servers.
+//
+// This package registers two drivers:
+//    sqlserver: uses native "@" parameter placeholder names and does no pre-processing.
+//    mssql: expects identifiers to be prefixed with ":" and pre-processes queries.
+//
+// If the ordinal position is used for query parameters, identifiers will be named
+// "@p1", "@p2", ... "@pN".
+//
+// Please refer to the README for the format of the DSN.
+package mssql

vendor/github.com/denisenkom/go-mssqldb/internal/cp/charset.go

@@ -1,14 +1,14 @@
-package mssql
+package cp
 
 type charsetMap struct {
 	sb [256]rune    // single byte runes, -1 for a double byte character lead byte
 	db map[int]rune // double byte runes
 }
 
-func collation2charset(col collation) *charsetMap {
+func collation2charset(col Collation) *charsetMap {
 	// http://msdn.microsoft.com/en-us/library/ms144250.aspx
 	// http://msdn.microsoft.com/en-us/library/ms144250(v=sql.105).aspx
-	switch col.sortId {
+	switch col.SortId {
 	case 30, 31, 32, 33, 34:
 		return cp437
 	case 40, 41, 42, 44, 49, 55, 56, 57, 58, 59, 60, 61:
@@ -86,7 +86,7 @@ func collation2charset(col collation) *charsetMap {
 	return cp1252
 }
 
-func charset2utf8(col collation, s []byte) string {
+func CharsetToUTF8(col Collation, s []byte) string {
 	cm := collation2charset(col)
 	if cm == nil {
 		return string(s)

vendor/github.com/denisenkom/go-mssqldb/internal/cp/collation.go

@@ -0,0 +1,20 @@
+package cp
+
+// http://msdn.microsoft.com/en-us/library/dd340437.aspx
+
+type Collation struct {
+	LcidAndFlags uint32
+	SortId       uint8
+}
+
+func (c Collation) getLcid() uint32 {
+	return c.LcidAndFlags & 0x000fffff
+}
+
+func (c Collation) getFlags() uint32 {
+	return (c.LcidAndFlags & 0x0ff00000) >> 20
+}
+
+func (c Collation) getVersion() uint32 {
+	return (c.LcidAndFlags & 0xf0000000) >> 28
+}

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1250.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1250 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1251.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1251 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1252.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1252 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1253.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1253 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1254.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1254 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1255.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1255 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1256.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1256 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1257.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1257 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp1258.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp1258 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp437.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp437 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp850.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp850 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp874.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp874 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp932.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp932 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp936.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp936 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp949.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp949 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/internal/cp/cp950.go

@@ -1,4 +1,4 @@
-package mssql
+package cp
 
 var cp950 *charsetMap = &charsetMap{
 	sb: [256]rune{

vendor/github.com/denisenkom/go-mssqldb/log.go

@@ -4,19 +4,26 @@ import (
 	"log"
 )
 
-type Logger log.Logger
+type Logger interface {
+	Printf(format string, v ...interface{})
+	Println(v ...interface{})
+}
 
-func (logger *Logger) Printf(format string, v ...interface{}) {
-	if logger != nil {
-		(*log.Logger)(logger).Printf(format, v...)
+type optionalLogger struct {
+	logger Logger
+}
+
+func (o optionalLogger) Printf(format string, v ...interface{}) {
+	if o.logger != nil {
+		o.logger.Printf(format, v...)
 	} else {
 		log.Printf(format, v...)
 	}
 }
 
-func (logger *Logger) Println(v ...interface{}) {
-	if logger != nil {
-		(*log.Logger)(logger).Println(v...)
+func (o optionalLogger) Println(v ...interface{}) {
+	if o.logger != nil {
+		o.logger.Println(v...)
 	} else {
 		log.Println(v...)
 	}