Added unit test.

Signed-off-by: David Wilkins <[email protected]>

Author: David Wilkins

connector.go

@@ -82,28 +82,12 @@ func (c *SQLConnection) GetDatabase() *sqlx.DB {
 
 	var err error
 
-	userinfo := c.URL.User.Username()
-	if password, hasPassword := c.URL.User.Password(); hasPassword {
-		userinfo = userinfo + ":" + password
-	}
-	c.URL.User = nil
 	clean := cleanURLQuery(c.URL)
 
 	if err = retry(c.L, time.Second*15, time.Minute*2, func() error {
 		c.L.Infof("Connecting with %s", c.URL.Scheme+"://*:*@"+c.URL.Host+c.URL.Path+"?"+clean.RawQuery)
 
-		if clean.Scheme == "mysql" {
-			q := clean.Query()
-			q.Set("parseTime", "true")
-			clean.RawQuery = q.Encode()
-		}
-		u := clean.String()
-		if strings.HasPrefix(u, clean.Scheme+"://") {
-			u = strings.Replace(u, clean.Scheme+"://", clean.Scheme+"://"+userinfo+"@", 1)
-		}
-		if clean.Scheme == "mysql" {
-			u = strings.Replace(u, "mysql://", "", -1)
-		}
+		u := connectionString(clean)
 		if c.db, err = sqlx.Open(clean.Scheme, u); err != nil {
 			return errors.Errorf("Could not Connect to SQL: %s", err)
 		} else if err := c.db.Ping(); err != nil {
@@ -161,3 +145,29 @@ func maxParallelism() int {
 	}
 	return numCPU
 }
+
+func connectionString(clean *url.URL) string {
+	if clean.Scheme == "mysql" {
+		q := clean.Query()
+		q.Set("parseTime", "true")
+		clean.RawQuery = q.Encode()
+	}
+
+	username := clean.User.Username()
+	userinfo := username
+	password, hasPassword := clean.User.Password()
+	if hasPassword {
+		userinfo = userinfo + ":" + password
+	}
+	clean.User = nil
+	u := clean.String()
+	clean.User = url.UserPassword(username, password)
+
+	if strings.HasPrefix(u, clean.Scheme+"://") {
+		u = strings.Replace(u, clean.Scheme+"://", clean.Scheme+"://"+userinfo+"@", 1)
+	}
+	if clean.Scheme == "mysql" {
+		u = strings.Replace(u, "mysql://", "", -1)
+	}
+	return u
+}

connector_test.go

@@ -78,6 +78,13 @@ func TestCleanQueryURL(t *testing.T) {
 	assert.Equal(t, false, strings.Contains(b.String(), "max_conn_lifetime"))
 }
 
+func TestConnectionString(t *testing.T) {
+	a, _ := url.Parse("mysql://foo@bar:baz@qux/db")
+	b := connectionString(a)
+	assert.NotEqual(t, b, a.String())
+	assert.True(t, strings.HasPrefix(b, "foo@bar:baz@qux"))
+}
+
 func mustSQL(t *testing.T, db string) *SQLConnection {
 	c, err := NewSQLConnection(db, logrus.New())
 	require.NoError(t, err)