Merge pull request #13 from golistic/bug/11-parsedns

Fix issues with parsing DSN query part

datasource.go

@@ -12,7 +12,7 @@ import (
 	"github.com/golistic/xstrings"
 )
 
-var reDSN = regexp.MustCompile(`(.*?)(?::(.*?))?@(\w+)\((.*?)\)(?:/(\w+))?(\?)?(?:/?(.*))?`)
+var reDSN = regexp.MustCompile(`(.*?)(?::(.*?))?@(\w+)\((.*?)\)(?:/(\w+))?/?(\?)?(.*)?`)
 
 type DataSource struct {
 	Driver   string
@@ -24,8 +24,8 @@ type DataSource struct {
 	UseTLS   bool
 }
 
-// ParseDNS parsers the name as a data source name (DSN).
-func ParseDNS(name string) (*DataSource, error) {
+// ParseDSN parsers the name as a data source name (DSN).
+func ParseDSN(name string) (*DataSource, error) {
 	errMsg := "invalid data source name (%w)"
 
 	m := reDSN.FindAllStringSubmatch(name, -1)
@@ -68,5 +68,15 @@ func (d *DataSource) String() string {
 	} else {
 		n += "/"
 	}
+
+	var queryParts []string
+	if d.UseTLS {
+		queryParts = append(queryParts, "useTLS=true")
+	}
+
+	if len(queryParts) > 0 {
+		n += "?" + strings.Join(queryParts, "&")
+	}
+
 	return n
 }

datasource_test.go

@@ -3,12 +3,13 @@
 package pxmysql
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/geertjanvdk/xkit/xt"
 )
 
-func TestParseDNS(t *testing.T) {
+func TestParseDSN(t *testing.T) {
 	t.Run("parse query string", func(t *testing.T) {
 		dsn := "scott:tiger@tcp(127.0.0.1:33060)/test?useTLS=true"
 		exp := &DataSource{
@@ -20,9 +21,13 @@ func TestParseDNS(t *testing.T) {
 			UseTLS:   true,
 		}
 
-		have, err := ParseDNS(dsn)
+		have, err := ParseDSN(dsn)
 		xt.OK(t, err)
 		xt.Eq(t, exp, have)
+
+		t.Run("using String-method, query part must be included", func(t *testing.T) {
+			xt.Assert(t, strings.Contains(have.String(), "?useTLS=true"))
+		})
 	})
 
 	t.Run("no query string provided", func(t *testing.T) {
@@ -36,41 +41,61 @@ func TestParseDNS(t *testing.T) {
 			UseTLS:   false,
 		}
 
-		have, err := ParseDNS(dsn)
+		have, err := ParseDSN(dsn)
 		xt.OK(t, err)
 		xt.Eq(t, exp, have)
+
+		t.Run("using String-method, with useTLS false, it is not included", func(t *testing.T) {
+			xt.Assert(t, !strings.Contains(have.String(), "?useTLS="))
+		})
 	})
 
 	t.Run("no default schema with query string", func(t *testing.T) {
-		dsn := "scott:tiger@tcp(127.0.0.1:33060)?useTLS=true"
-		exp := &DataSource{
-			User:     "scott",
-			Password: "tiger",
-			Protocol: "tcp",
-			Address:  "127.0.0.1:33060",
-			Schema:   "",
-			UseTLS:   true,
+		var cases = map[string]string{
+			"without slash": "scott:tiger@tcp(127.0.0.1:33060)/?useTLS=true",
+			"with slash":    "scott:tiger@tcp(127.0.0.1:33060)?useTLS=true",
 		}
 
-		have, err := ParseDNS(dsn)
-		xt.OK(t, err)
-		xt.Eq(t, exp, have)
+		for name, dsn := range cases {
+			t.Run(name, func(t *testing.T) {
+				exp := &DataSource{
+					User:     "scott",
+					Password: "tiger",
+					Protocol: "tcp",
+					Address:  "127.0.0.1:33060",
+					Schema:   "",
+					UseTLS:   true,
+				}
+
+				have, err := ParseDSN(dsn)
+				xt.OK(t, err)
+				xt.Eq(t, exp, have)
+			})
+		}
 	})
 
 	t.Run("no default schema without query string", func(t *testing.T) {
-		dsn := "scott:tiger@tcp(127.0.0.1:33060)"
-		exp := &DataSource{
-			User:     "scott",
-			Password: "tiger",
-			Protocol: "tcp",
-			Address:  "127.0.0.1:33060",
-			Schema:   "",
-			UseTLS:   false,
+		var cases = map[string]string{
+			"without slash": "scott:tiger@tcp(127.0.0.1:33060)/",
+			"with slash":    "scott:tiger@tcp(127.0.0.1:33060)",
 		}
 
-		have, err := ParseDNS(dsn)
-		xt.OK(t, err)
-		xt.Eq(t, exp, have)
+		for name, dsn := range cases {
+			t.Run(name, func(t *testing.T) {
+				exp := &DataSource{
+					User:     "scott",
+					Password: "tiger",
+					Protocol: "tcp",
+					Address:  "127.0.0.1:33060",
+					Schema:   "",
+					UseTLS:   false,
+				}
+
+				have, err := ParseDSN(dsn)
+				xt.OK(t, err)
+				xt.Eq(t, exp, have)
+			})
+		}
 	})
 
 	t.Run("no password", func(t *testing.T) {
@@ -84,7 +109,7 @@ func TestParseDNS(t *testing.T) {
 			UseTLS:   false,
 		}
 
-		have, err := ParseDNS(dsn)
+		have, err := ParseDSN(dsn)
 		xt.OK(t, err)
 		xt.Eq(t, exp, have)
 	})
@@ -100,7 +125,7 @@ func TestParseDNS(t *testing.T) {
 			UseTLS:   false,
 		}
 
-		have, err := ParseDNS(dsn)
+		have, err := ParseDSN(dsn)
 		xt.OK(t, err)
 		xt.Eq(t, exp, have)
 	})

driver.go

@@ -35,7 +35,7 @@ func (d *Driver) Open(name string) (driver.Conn, error) {
 // to the MySQL database using MySQL X Protocol.
 // This will be used instead of the Open-method (which actually uses this method).
 func (d *Driver) OpenConnector(name string) (driver.Connector, error) {
-	ds, err := ParseDNS(name)
+	ds, err := ParseDSN(name)
 	if err != nil {
 		return nil, err
 	}