Merge pull request go-sql-driver#403 from go-sql-driver/dsn

Export ParseDSN and Config

benchmark_test.go

@@ -216,9 +216,9 @@ func BenchmarkRoundtripBin(b *testing.B) {
 
 func BenchmarkInterpolation(b *testing.B) {
  mc := &mysqlConn{
- cfg: &config{
- interpolateParams: true,
- loc: time.UTC,
+ cfg: &Config{
+ InterpolateParams: true,
+ Loc: time.UTC,
  },
  maxPacketAllowed: maxPacketSize,
  maxWriteSize: maxPacketSize - 1,

connection.go

@@ -9,9 +9,7 @@
 package mysql
 
 import (
- "crypto/tls"
  "database/sql/driver"
- "errors"
  "net"
  "strconv"
  "strings"
@@ -23,7 +21,7 @@ type mysqlConn struct {
  netConn net.Conn
  affectedRows uint64
  insertId uint64
- cfg *config
+ cfg *Config
  maxPacketAllowed int
  maxWriteSize int
  flags clientFlag
@@ -33,28 +31,9 @@ type mysqlConn struct {
  strict bool
 }
 
-type config struct {
- user string
- passwd string
- net string
- addr string
- dbname string
- params map[string]string
- loc *time.Location
- tls *tls.Config
- timeout time.Duration
- collation uint8
- allowAllFiles bool
- allowOldPasswords bool
- allowCleartextPasswords bool
- clientFoundRows bool
- columnsWithAlias bool
- interpolateParams bool
-}
-
 // Handles parameters set in DSN after the connection is established
 func (mc *mysqlConn) handleParams() (err error) {
- for param, val := range mc.cfg.params {
+ for param, val := range mc.cfg.Params {
  switch param {
  // Charset
  case "charset":
@@ -70,27 +49,6 @@ func (mc *mysqlConn) handleParams() (err error) {
  return
  }
 
- // time.Time parsing
- case "parseTime":
- var isBool bool
- mc.parseTime, isBool = readBool(val)
- if !isBool {
- return errors.New("Invalid Bool value: " + val)
- }
-
- // Strict mode
- case "strict":
- var isBool bool
- mc.strict, isBool = readBool(val)
- if !isBool {
- return errors.New("Invalid Bool value: " + val)
- }
-
- // Compression
- case "compress":
- err = errors.New("Compression not implemented yet")
- return
-
  // System Vars
  default:
  err = mc.exec("SET " + param + "=" + val + "")
@@ -217,7 +175,7 @@ func (mc *mysqlConn) interpolateParams(query string, args []driver.Value) (strin
  if v.IsZero() {
  buf = append(buf, "'0000-00-00'"...)
  } else {
- v := v.In(mc.cfg.loc)
+ v := v.In(mc.cfg.Loc)
  v = v.Add(time.Nanosecond * 500) // To round under microsecond
  year := v.Year()
  year100 := year / 100
@@ -298,7 +256,7 @@ func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, err
  return nil, driver.ErrBadConn
  }
  if len(args) != 0 {
- if !mc.cfg.interpolateParams {
+ if !mc.cfg.InterpolateParams {
  return nil, driver.ErrSkip
  }
  // try to interpolate the parameters to save extra roundtrips for preparing and closing a statement
@@ -349,7 +307,7 @@ func (mc *mysqlConn) Query(query string, args []driver.Value) (driver.Rows, erro
  return nil, driver.ErrBadConn
  }
  if len(args) != 0 {
- if !mc.cfg.interpolateParams {
+ if !mc.cfg.InterpolateParams {
  return nil, driver.ErrSkip
  }
  // try client-side prepare to reduce roundtrip
@@ -395,6 +353,7 @@ func (mc *mysqlConn) getSystemVar(name string) ([]byte, error) {
  if err == nil {
  rows := new(textRows)
  rows.mc = mc
+ rows.columns = []mysqlField{{fieldType: fieldTypeVarChar}}
 
  if resLen > 0 {
  // Columns

driver.go

@@ -53,17 +53,19 @@ func (d MySQLDriver) Open(dsn string) (driver.Conn, error) {
  maxPacketAllowed: maxPacketSize,
  maxWriteSize: maxPacketSize - 1,
  }
- mc.cfg, err = parseDSN(dsn)
+ mc.cfg, err = ParseDSN(dsn)
  if err != nil {
  return nil, err
  }
+ mc.parseTime = mc.cfg.ParseTime
+ mc.strict = mc.cfg.Strict
 
  // Connect to Server
- if dial, ok := dials[mc.cfg.net]; ok {
- mc.netConn, err = dial(mc.cfg.addr)
+ if dial, ok := dials[mc.cfg.Net]; ok {
+ mc.netConn, err = dial(mc.cfg.Addr)
  } else {
- nd := net.Dialer{Timeout: mc.cfg.timeout}
- mc.netConn, err = nd.Dial(mc.cfg.net, mc.cfg.addr)
+ nd := net.Dialer{Timeout: mc.cfg.Timeout}
+ mc.netConn, err = nd.Dial(mc.cfg.Net, mc.cfg.Addr)
  }
  if err != nil {
  return nil, err
@@ -136,15 +138,15 @@ func handleAuthResult(mc *mysqlConn, cipher []byte) error {
  }
 
  // Retry auth if configured to do so.
- if mc.cfg.allowOldPasswords && err == ErrOldPassword {
+ if mc.cfg.AllowOldPasswords && err == ErrOldPassword {
  // Retry with old authentication method. Note: there are edge cases
  // where this should work but doesn't; this is currently "wontfix":
  // https://github.com/go-sql-driver/mysql/issues/184
  if err = mc.writeOldAuthPacket(cipher); err != nil {
  return err
  }
  err = mc.readResultOK()
- } else if mc.cfg.allowCleartextPasswords && err == ErrCleartextPassword {
+ } else if mc.cfg.AllowCleartextPasswords && err == ErrCleartextPassword {
  // Retry with clear text password for
  // https://dev.mysql.com/doc/refman/5.7/en/cleartext-authentication-plugin.html
  // https://dev.mysql.com/doc/refman/5.7/en/pam-authentication-plugin.html

driver_test.go

@@ -91,7 +91,7 @@ func runTests(t *testing.T, dsn string, tests ...func(dbt *DBTest)) {
 
  dsn2 := dsn + "&interpolateParams=true"
  var db2 *sql.DB
- if _, err := parseDSN(dsn2); err != errInvalidDSNUnsafeCollation {
+ if _, err := ParseDSN(dsn2); err != errInvalidDSNUnsafeCollation {
  db2, err = sql.Open("mysql", dsn2)
  if err != nil {
  t.Fatalf("Error connecting: %s", err.Error())