Rename connectionAttributes to connectAttrs and mention performance_schema in readme

Author: Vasfed

.travis.yml

@@ -16,6 +16,7 @@ before_script:
   - sudo service mysql restart
   - .travis/wait_mysql.sh
   - mysql -e 'create database gotest;'
+  - mysql -e 'show databases;'
 
 matrix:
   include:

README.md

@@ -204,15 +204,15 @@ SELECT u.id FROM users as u
 
 will return `u.id` instead of just `id` if `columnsWithAlias=true`.
 
-##### `connectionAttributes`
+##### `connectAttrs`
 
 ```
 Type:           map
 Valid Values:   comma-separated list of attribute:value pairs
 Default:        empty
 ```
 
-Allows setting of connection attributes, for example `connectionAttributes=program_name:YourProgramName` will show `YourProgramName` in `Program` field of connections list of Mysql Workbench.
+Allows setting of connection attributes, for example `connectAttrs=program_name:YourProgramName` will show `YourProgramName` in `Program` field of connections list of Mysql Workbench, if your server supports it (requires `performance_schema` to be supported and enabled).
 
 ##### `interpolateParams`
 
@@ -497,4 +497,3 @@ Please read the [MPL 2.0 FAQ](https://www.mozilla.org/en-US/MPL/2.0/FAQ/) if you
 You can read the full terms here: [LICENSE](https://raw.github.com/go-sql-driver/mysql/master/LICENSE).
 
 ![Go Gopher and MySQL Dolphin](https://raw.github.com/wiki/go-sql-driver/mysql/go-mysql-driver_m.jpg "Golang Gopher transporting the MySQL Dolphin in a wheelbarrow")
-

driver_test.go

@@ -2074,21 +2074,29 @@ func TestEmptyPassword(t *testing.T) {
   }
 }
 
-func TestConnectionAttributes(t *testing.T) {
+func TestConnectAttrs(t *testing.T) {
 	if !available {
 		t.Skipf("MySQL server not running on %s", netAddr)
 	}
 
-	db, err := sql.Open("mysql", dsn+"&connectionAttributes=program_name:GoTest,foo:bar")
+	db, err := sql.Open("mysql", dsn+"&connectAttrs=program_name:GoTest,foo:bar")
 	if err != nil {
 		t.Fatalf("error connecting: %s", err.Error())
 	}
 	defer db.Close()
 	dbt := &DBTest{t, db}
 
-	rows, err := dbt.db.Query("SELECT program_name FROM sys.processlist WHERE db=?", dbname)
+  // performance_schema seems to be updated with a delay in some conditions, so first see if we are in list:
+  rows := dbt.mustQuery("SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST where ID=CONNECTION_ID()")
+  if rows.Next() {
+  } else {
+    dbt.Error("no data in processlist")
+  }
+
+	rows, err = dbt.db.Query("select attr_value from performance_schema.session_account_connect_attrs where processlist_id=CONNECTION_ID() and attr_name='program_name'")
 	if err != nil {
-		dbt.Skip("server probably does not support program_name in sys.processlist")
+    fmt.Println(err)
+		dbt.Skip("server probably does not support performance_schema.session_account_connect_attrs")
 	}
 
 	if rows.Next() {
@@ -2098,7 +2106,7 @@ func TestConnectionAttributes(t *testing.T) {
 			dbt.Errorf("GoTest != %s", str)
 		}
 	} else {
-		dbt.Error("no data")
+		dbt.Error("no data for program_name")
 	}
 
 	rows = dbt.mustQuery("select attr_value from performance_schema.session_account_connect_attrs where processlist_id=CONNECTION_ID() and attr_name='foo'")
@@ -2109,6 +2117,6 @@ func TestConnectionAttributes(t *testing.T) {
 			dbt.Errorf("bar != %s", str)
 		}
 	} else {
-		dbt.Error("no data")
+		dbt.Error("no data for custom attribute")
 	}
 }

dsn.go

@@ -39,7 +39,7 @@ type Config struct {
 	Addr             string            // Network address (requires Net)
 	DBName           string            // Database name
 	Params           map[string]string // Connection parameters
-	Attributes       map[string]string // Connection attributes
+	ConnectAttrs     map[string]string // Connection attributes
 	Collation        string            // Connection collation
 	Loc              *time.Location    // Location for time.Time values
 	MaxAllowedPacket int               // Max packet size allowed
@@ -309,17 +309,17 @@ func (cfg *Config) FormatDSN() string {
 
 	}
 
-	if len(cfg.Attributes) > 0 {
-		// connectionAttributes=program_name:Login Server,other_name:other
+	if len(cfg.ConnectAttrs) > 0 {
+		// connectAttrs=program_name:Login Server,other_name:other
 		if hasParam {
-			buf.WriteString("&connectionAttributes=")
+			buf.WriteString("&connectAttrs=")
 		} else {
 			hasParam = true
-			buf.WriteString("?connectionAttributes=")
+			buf.WriteString("?connectAttrs=")
 		}
 
 		var attr_names []string
-		for attr_name := range cfg.Attributes {
+		for attr_name := range cfg.ConnectAttrs {
 			attr_names = append(attr_names, attr_name)
 		}
 		sort.Strings(attr_names)
@@ -329,7 +329,7 @@ func (cfg *Config) FormatDSN() string {
 			}
 			buf.WriteString(attr_name)
 			buf.WriteByte(':')
-			buf.WriteString(url.QueryEscape(cfg.Attributes[attr_name]))
+			buf.WriteString(url.QueryEscape(cfg.ConnectAttrs[attr_name]))
 		}
 	}
 
@@ -613,23 +613,23 @@ func parseDSNParams(cfg *Config, params string) (err error) {
 			if err != nil {
 				return
 			}
-		case "connectionAttributes":
-			if cfg.Attributes == nil {
-				cfg.Attributes = make(map[string]string)
+		case "connectAttrs":
+			if cfg.ConnectAttrs == nil {
+				cfg.ConnectAttrs = make(map[string]string)
 			}
 
-			var attributes string
-			if attributes, err = url.QueryUnescape(value); err != nil {
+			var ConnectAttrs string
+			if ConnectAttrs, err = url.QueryUnescape(value); err != nil {
 				return
 			}
 
 			// program_name:Name,foo:bar
-			for _, attr_str := range strings.Split(attributes, ",") {
+			for _, attr_str := range strings.Split(ConnectAttrs, ",") {
 				attr := strings.SplitN(attr_str, ":", 2)
 				if len(attr) != 2 {
 					continue
 				}
-				cfg.Attributes[attr[0]] = attr[1]
+				cfg.ConnectAttrs[attr[0]] = attr[1]
 			}
 		default:
 			// lazy init

dsn_test.go

@@ -72,8 +72,8 @@ var testDSNs = []struct {
 	"tcp(de:ad:be:ef::ca:fe)/dbname",
 	&Config{Net: "tcp", Addr: "[de:ad:be:ef::ca:fe]:3306", DBName: "dbname", Collation: "utf8_general_ci", Loc: time.UTC, MaxAllowedPacket: defaultMaxAllowedPacket, AllowNativePasswords: true},
 }, {
-	"tcp(127.0.0.1)/dbname?connectionAttributes=program_name:SomeService",
-	&Config{Net: "tcp", Addr: "127.0.0.1:3306", DBName: "dbname", Attributes: map[string]string{"program_name": "SomeService"}, Collation: "utf8_general_ci", Loc: time.UTC, MaxAllowedPacket: defaultMaxAllowedPacket, AllowNativePasswords: true},
+	"tcp(127.0.0.1)/dbname?connectAttrs=program_name:SomeService",
+	&Config{Net: "tcp", Addr: "127.0.0.1:3306", DBName: "dbname", ConnectAttrs: map[string]string{"program_name": "SomeService"}, Collation: "utf8_general_ci", Loc: time.UTC, MaxAllowedPacket: defaultMaxAllowedPacket, AllowNativePasswords: true},
 },
 }
 
@@ -322,16 +322,16 @@ func TestParamsAreSorted(t *testing.T) {
 }
 
 func TestAttributesAreSorted(t *testing.T) {
-	expected := "/dbname?connectionAttributes=p1:v1,p2:v2"
+	expected := "/dbname?connectAttrs=p1:v1,p2:v2"
 	cfg := NewConfig()
 	cfg.DBName = "dbname"
-	cfg.Attributes = map[string]string{
+	cfg.ConnectAttrs = map[string]string{
 		"p2": "v2",
 		"p1": "v1",
 	}
 	actual := cfg.FormatDSN()
 	if actual != expected {
-		t.Errorf("generic Config.Attributes were not sorted: want %#v, got %#v", expected, actual)
+		t.Errorf("generic Config.ConnectAttrs were not sorted: want %#v, got %#v", expected, actual)
 	}
 }
 

packets.go

@@ -295,7 +295,7 @@ func (mc *mysqlConn) writeHandshakeResponsePacket(authResp []byte, addNUL bool,
 		connectAttrsBuf = appendLengthEncodedString(connectAttrsBuf, []byte("_client_name"))
 		connectAttrsBuf = appendLengthEncodedString(connectAttrsBuf, []byte("go-mysql-driver"))
 
-		for k, v := range mc.cfg.Attributes {
+		for k, v := range mc.cfg.ConnectAttrs {
 			if k == "_client_name" {
 				// do not allow overwriting reserved values
 				continue