Merge remote-tracking branch 'upstream/master' into ed25519-auth

methane · methane · commit da50f268e58e · 2023-12-12T14:23:36.000+09:00
diff --git a/driver_test.go b/driver_test.go
@@ -128,6 +128,8 @@ func runTestsWithMultiStatement(t *testing.T, dsn string, tests ...func(dbt *DBT
 		}
 		defer db.Close()
 	}
+	// Previous test may be skipped without dropping the test table
+	db.Exec("DROP TABLE IF EXISTS test")
 
 	dbt := &DBTest{t, db}
 	for _, test := range tests {
@@ -147,6 +149,7 @@ func runTests(t *testing.T, dsn string, tests ...func(dbt *DBTest)) {
 	}
 	defer db.Close()
 
+	// Previous test may be skipped without dropping the test table
 	db.Exec("DROP TABLE IF EXISTS test")
 
 	dsn2 := dsn + "&interpolateParams=true"

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,8 @@ func runTestsWithMultiStatement(t testing.T, dsn string, tests ...func(dbt DBT`
`128`	`128`	`}`
`129`	`129`	`defer db.Close()`
`130`	`130`	`}`
	`131`	`+ // Previous test may be skipped without dropping the test table`
	`132`	`+ db.Exec("DROP TABLE IF EXISTS test")`
`131`	`133`
`132`	`134`	`dbt := &DBTest{t, db}`
`133`	`135`	`for _, test := range tests {`
`@@ -147,6 +149,7 @@ func runTests(t testing.T, dsn string, tests ...func(dbt DBTest)) {`
`147`	`149`	`}`
`148`	`150`	`defer db.Close()`
`149`	`151`
	`152`	`+ // Previous test may be skipped without dropping the test table`
`150`	`153`	`db.Exec("DROP TABLE IF EXISTS test")`
`151`	`154`
`152`	`155`	`dsn2 := dsn + "&interpolateParams=true"`