@@ -87,19 +87,21 @@ func runTests(t *testing.T, dsn string, tests ...func(dbt *DBTest)) {
8787
8888 db .Exec ("DROP TABLE IF EXISTS test" )
8989
90- dbp , err := sql .Open ("mysql" , dsn + "&interpolateParams=true" )
91- if err != nil {
92- t .Fatalf ("Error connecting: %s" , err .Error ())
90+ dsn2 := dsn + "&interpolateParams=true"
91+ var db2 * sql.DB
92+ if _ , err := parseDSN (dsn2 ); err != errInvalidDSNUnsafeCollation {
93+ db2 , err = sql .Open ("mysql" , dsn2 )
9394 }
94- defer dbp .Close ()
9595
9696 dbt := & DBTest {t , db }
97- dbtp := & DBTest {t , dbp }
97+ dbt2 := & DBTest {t , db2 }
9898 for _ , test := range tests {
9999 test (dbt )
100100 dbt .db .Exec ("DROP TABLE IF EXISTS test" )
101- test (dbtp )
102- dbtp .db .Exec ("DROP TABLE IF EXISTS test" )
101+ if db2 != nil {
102+ test (dbt2 )
103+ dbt2 .db .Exec ("DROP TABLE IF EXISTS test" )
104+ }
103105 }
104106}
105107
@@ -864,7 +866,7 @@ func TestLoadData(t *testing.T) {
864866 dbt .Fatalf ("%d != %d" , i , id )
865867 }
866868 if values [i - 1 ] != value {
867- dbt .Fatalf ("%s != %s " , values [i - 1 ], value )
869+ dbt .Fatalf ("%q != %q " , values [i - 1 ], value )
868870 }
869871 }
870872 err = rows .Err ()
@@ -889,7 +891,7 @@ func TestLoadData(t *testing.T) {
889891
890892 // Local File
891893 RegisterLocalFile (file .Name ())
892- dbt .mustExec (fmt .Sprintf ("LOAD DATA LOCAL INFILE '%q' INTO TABLE test" , file .Name ()))
894+ dbt .mustExec (fmt .Sprintf ("LOAD DATA LOCAL INFILE %q INTO TABLE test" , file .Name ()))
893895 verifyLoadDataResult ()
894896 // negative test
895897 _ , err = dbt .db .Exec ("LOAD DATA LOCAL INFILE 'doesnotexist' INTO TABLE test" )
0 commit comments