Merge pull request #400 from Carrotman42/master

Use Errorf instead of Error in the correct places

utils_test.go

@@ -137,37 +137,37 @@ func TestDSNWithCustomTLS_queryEscape(t *testing.T) {
 func TestDSNUnsafeCollation(t *testing.T) {
 	_, err := parseDSN("/dbname?collation=gbk_chinese_ci&interpolateParams=true")
 	if err != errInvalidDSNUnsafeCollation {
-		t.Error("Expected %v, Got %v", errInvalidDSNUnsafeCollation, err)
+		t.Errorf("Expected %v, Got %v", errInvalidDSNUnsafeCollation, err)
 	}
 
 	_, err = parseDSN("/dbname?collation=gbk_chinese_ci&interpolateParams=false")
 	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
+		t.Errorf("Expected %v, Got %v", nil, err)
 	}
 
 	_, err = parseDSN("/dbname?collation=gbk_chinese_ci")
 	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
+		t.Errorf("Expected %v, Got %v", nil, err)
 	}
 
 	_, err = parseDSN("/dbname?collation=ascii_bin&interpolateParams=true")
 	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
+		t.Errorf("Expected %v, Got %v", nil, err)
 	}
 
 	_, err = parseDSN("/dbname?collation=latin1_german1_ci&interpolateParams=true")
 	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
+		t.Errorf("Expected %v, Got %v", nil, err)
 	}
 
 	_, err = parseDSN("/dbname?collation=utf8_general_ci&interpolateParams=true")
 	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
+		t.Errorf("Expected %v, Got %v", nil, err)
 	}
 
 	_, err = parseDSN("/dbname?collation=utf8mb4_general_ci&interpolateParams=true")
 	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
+		t.Errorf("Expected %v, Got %v", nil, err)
 	}
 }