Merge pull request #143 from EasyPost/issue_142

Shlomi Noach · web-flow · commit 01d48e667ce6 · 2016-08-15T10:53:36.000+02:00
Thank you
diff --git a/go/mysql/connection.go b/go/mysql/connection.go
@@ -7,6 +7,7 @@ package mysql
 
 import (
 	"fmt"
+	"net"
 )
 
 // ConnectionConfig is the minimal configuration required to connect to a MySQL server
@@ -47,5 +48,11 @@ func (this *ConnectionConfig) Equals(other *ConnectionConfig) bool {
 }
 
 func (this *ConnectionConfig) GetDBUri(databaseName string) string {
-	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s", this.User, this.Password, this.Key.Hostname, this.Key.Port, databaseName)
+	var ip = net.ParseIP(this.Key.Hostname)
+	if (ip != nil) && (ip.To4() == nil) {
+		// Wrap IPv6 literals in square brackets
+		return fmt.Sprintf("%s:%s@tcp([%s]:%d)/%s", this.User, this.Password, this.Key.Hostname, this.Key.Port, databaseName)
+	} else {
+		return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s", this.User, this.Password, this.Key.Hostname, this.Key.Port, databaseName)
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ package mysql`
`7`	`7`
`8`	`8`	`import (`
`9`	`9`	`"fmt"`
	`10`	`+ "net"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`// ConnectionConfig is the minimal configuration required to connect to a MySQL server`
`@@ -47,5 +48,11 @@ func (this ConnectionConfig) Equals(other ConnectionConfig) bool {`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`func (this *ConnectionConfig) GetDBUri(databaseName string) string {`
`50`		`- return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s", this.User, this.Password, this.Key.Hostname, this.Key.Port, databaseName)`
	`51`	`+ var ip = net.ParseIP(this.Key.Hostname)`
	`52`	`+ if (ip != nil) && (ip.To4() == nil) {`
	`53`	`+ // Wrap IPv6 literals in square brackets`
	`54`	`+ return fmt.Sprintf("%s:%s@tcp([%s]:%d)/%s", this.User, this.Password, this.Key.Hostname, this.Key.Port, databaseName)`
	`55`	`+ } else {`
	`56`	`+ return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s", this.User, this.Password, this.Key.Hostname, this.Key.Port, databaseName)`
	`57`	`+ }`
`51`	`58`	`}`