Fix test suite to work again with DBICTEST_SQLITE_USE_FILE

( partial cherry-pick of ee573365 )

diff --git a/t/prefetch/correlated.t b/t/prefetch/correlated.t
index 6452a94..90bd026 100644 (file)
--- a/t/prefetch/correlated.t
+++ b/t/prefetch/correlated.t
@@ -138,6 +138,8 @@ is_same_sql_bind(
   'Expected SQL on correlated realiased subquery'
 );
 
+$schema->storage->disconnect;
+
 # test for subselect identifier leakage
 # NOTE - the hodge-podge mix of literal and regular identifuers is *deliberate*
 for my $quote_names (0,1) {

diff --git a/t/sqlmaker/mysql.t b/t/sqlmaker/mysql.t
index 2755a3d..e0cd4fc 100644 (file)
--- a/t/sqlmaker/mysql.t
+++ b/t/sqlmaker/mysql.t
@@ -3,6 +3,9 @@ use warnings;
 
 use Test::More;
 
+# Fixed properly in mainline
+BEGIN { delete $ENV{DBICTEST_SQLITE_USE_FILE} }
+
 use lib qw(t/lib);
 use DBICTest;
 use DBICTest::Schema;