use Path::Class for finding subdirs of t and don't use global filehandle for slurping

[dbsrgits/DBIx-Class.git] / t / lib / DBICTest.pm

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index 953b249..b4a60aa 100644 (file)
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -6,6 +6,7 @@ use warnings;
 use DBICTest::RunMode;
 use DBICTest::Schema;
 use Carp;
+use Path::Class::File ();
 
 =head1 NAME
 
@@ -53,7 +54,9 @@ sub has_custom_dsn {
 }
 
 sub _sqlite_dbfilename {
-    return "t/var/DBIxClass.db";
+    my $dir = Path::Class::File->new(__FILE__)->dir->parent->subdir('var');
+    $dir->mkpath unless -d "$dir";
+    return $dir->file('DBIxClass.db')->stringify;
 }
 
 sub _sqlite_dbname {
@@ -78,12 +81,10 @@ sub _database {
     for ($db_file, "${db_file}-journal") {
       next unless -e $_;
       unlink ($_) or carp (
-        "Unable to unlink existing test database file $_ ($!), creation of fresh database / further tests may fail!\n"
+        "Unable to unlink existing test database file $_ ($!), creation of fresh database / further tests may fail!"
       );
     }
 
-    mkdir("t/var") unless -d "t/var";
-
     return ("dbi:SQLite:${db_file}", '', '', {
       AutoCommit => 1,
 
@@ -112,6 +113,8 @@ sub _database {
 }
 
 sub __mk_disconnect_guard {
+  return if DBIx::Class::_ENV_::PEEPEENESS(); # leaks handles, delaying DESTROY, can't work right
+
   my $db_file = shift;
   return unless -f $db_file;
 
@@ -228,10 +231,9 @@ sub deploy_schema {
     if ($ENV{"DBICTEST_SQLT_DEPLOY"}) { 
         $schema->deploy($args);
     } else {
-        open IN, "t/lib/sqlite.sql";
-        my $sql;
-        { local $/ = undef; $sql = <IN>; }
-        close IN;
+        my $filename = Path::Class::File->new(__FILE__)->dir
+          ->file('sqlite.sql')->stringify;
+        my $sql = do { local (@ARGV, $/) = $filename ; <> };
         for my $chunk ( split (/;\s*\n+/, $sql) ) {
           if ( $chunk =~ / ^ (?! --\s* ) \S /xm ) {  # there is some real sql in the chunk - a non-space at the start of the string which is not a comment
             $schema->storage->dbh_do(sub { $_[1]->do($chunk) }) or print "Error on SQL: $chunk\n";