X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class-DeploymentHandler.git;a=blobdiff_plain;f=t%2Fdeploy_methods%2Fsql_translator.t;h=d160ede6d8344c4549b21f168dd9f3c3a46770b3;hp=1a81c33cddd5e1df181a5175c319967b5f156459;hb=7b3d00f984e43c319a637332579e950376637a3d;hpb=562030878a850a01073774f27769748077c79176

diff --git a/t/deploy_methods/sql_translator.t b/t/deploy_methods/sql_translator.t
index 1a81c33..d160ede 100644
--- a/t/deploy_methods/sql_translator.t
+++ b/t/deploy_methods/sql_translator.t
@@ -9,29 +9,27 @@ use Test::Exception;
 use lib 't/lib';
 use DBICDHTest;
 use aliased 'DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator';
-use File::Spec::Functions;
+use File::Spec::Functions qw(catfile splitdir);
 use File::Path qw(rmtree mkpath);
-use File::Temp 'tempfile';
+use File::Temp qw(tempfile tempdir);
 
 my $dbh = DBICDHTest::dbh();
 my @connection = (sub { $dbh }, { ignore_version => 1 });
-my $sql_dir = 't/sql';
+my $sql_dir = tempdir( CLEANUP => 1 );
 my (undef, $stuffthatran_fn) = tempfile(OPEN => 0);
 
-DBICDHTest::ready;
-
 for (qw(initialize upgrade downgrade deploy)) {
-   mkpath(catfile(qw( t sql _common),  $_, '_any' ));
+   mkpath(catfile(splitdir($sql_dir), '_common',  $_, '_any' ));
    open my $fh, '>',
-      catfile(qw( t sql _common), $_, qw(_any 000-win.pl ));
+      catfile(splitdir($sql_dir), '_common', $_, qw(_any 000-win.pl ));
    print {$fh} qq^sub {open my \$fh, ">>", '$stuffthatran_fn'; use Data::Dumper::Concise; print {\$fh} join(",", \@{\$_[1]||[]}) . "\\n";  }^;
    close $fh;
 }
 
 for (qw(initialize upgrade downgrade deploy)) {
-   mkpath(catfile(qw( t sql SQLite),  $_, '_any' ));
+   mkpath(catfile(splitdir($sql_dir), 'SQLite',  $_, '_any' ));
    open my $fh, '>',
-      catfile(qw( t sql SQLite), $_, qw(_any 000-win2.pl ));
+      catfile(splitdir($sql_dir), 'SQLite', $_, qw(_any 000-win2.pl ));
    print {$fh} qq^sub {open my \$fh, ">>", '$stuffthatran_fn'; use Data::Dumper::Concise; print {\$fh} join(",", \@{\$_[1]||[]}) . "\\n";  }^;
    close $fh;
 }
@@ -50,9 +48,9 @@ VERSION1: {
 
    $dm->prepare_deploy;
 
-   mkpath(catfile(qw( t sql SQLite initialize 1.0 )));
+   mkpath(catfile(splitdir($sql_dir), qw(SQLite initialize 1.0 )));
    open my $prerun, '>',
-      catfile(qw( t sql SQLite initialize 1.0 003-semiautomatic.pl ));
+      catfile(splitdir($sql_dir), qw(SQLite initialize 1.0 003-semiautomatic.pl ));
    my (undef, $fn) = tempfile(OPEN => 0);
    print {$prerun} "sub { open my \$fh, '>', '$fn'}";
    close $prerun;
@@ -63,7 +61,7 @@ VERSION1: {
    dies_ok {$dm->prepare_deploy} 'prepare_deploy dies if you run it twice' ;
 
    ok(
-      -f catfile(qw( t sql SQLite deploy 1.0 001-auto.sql )),
+      -f catfile(splitdir($sql_dir), qw(SQLite deploy 1.0 001-auto.sql )),
       '1.0 schema gets generated properly'
    );
 
@@ -98,10 +96,10 @@ VERSION2: {
    my $version = $s->schema_version();
    $dm->prepare_deploy;
    ok(
-      -f catfile(qw( t sql SQLite deploy 2.0 001-auto.sql )),
+      -f catfile(splitdir($sql_dir), qw(SQLite deploy 2.0 001-auto.sql )),
       '2.0 schema gets generated properly'
    );
-   mkpath(catfile(qw( t sql SQLite upgrade 1.0-2.0 )));
+   mkpath(catfile(splitdir($sql_dir), qw(SQLite upgrade 1.0-2.0 )));
    $dm->prepare_upgrade({
      from_version => '1.0',
      to_version => '2.0',
@@ -119,17 +117,17 @@ VERSION2: {
       ok( $warned, 'prepare_upgrade with a bogus preversion warns' );
    }
    ok(
-      -f catfile(qw( t sql SQLite upgrade 1.0-2.0 001-auto.sql )),
+      -f catfile(splitdir($sql_dir), qw(SQLite upgrade 1.0-2.0 001-auto.sql )),
       '1.0-2.0 diff gets generated properly and default start and end versions get set'
    );
-   mkpath(catfile(qw( t sql SQLite downgrade 2.0-1.0 )));
+   mkpath(catfile(splitdir($sql_dir), qw(SQLite downgrade 2.0-1.0 )));
    $dm->prepare_downgrade({
      from_version => $version,
      to_version => '1.0',
      version_set => [$version, '1.0']
    });
    ok(
-      -f catfile(qw( t sql SQLite downgrade 2.0-1.0 001-auto.sql )),
+      -f catfile(splitdir($sql_dir), qw(SQLite downgrade 2.0-1.0 001-auto.sql )),
       '2.0-1.0 diff gets generated properly'
    );
    dies_ok {
@@ -145,14 +143,14 @@ VERSION2: {
       })
    } 'schema not uppgrayyed';
 
-   mkpath catfile(qw( t sql _common upgrade 1.0-2.0 ));
+   mkpath catfile(splitdir($sql_dir), qw(_common upgrade 1.0-2.0 ));
    open my $common, '>',
-      catfile(qw( t sql _common upgrade 1.0-2.0 002-semiautomatic.sql ));
+      catfile(splitdir($sql_dir), qw(_common upgrade 1.0-2.0 002-semiautomatic.sql ));
    print {$common} qq<INSERT INTO Foo (bar, baz) VALUES ("hello", "world");\n\n>;
    close $common;
 
    open my $common_pl, '>',
-      catfile(qw( t sql _common upgrade 1.0-2.0 003-semiautomatic.pl ));
+      catfile(splitdir($sql_dir), qw(_common upgrade 1.0-2.0 003-semiautomatic.pl ));
    print {$common_pl} q|
       sub {
          my $schema = shift;
@@ -205,7 +203,7 @@ VERSION3: {
    my $version = $s->schema_version();
    $dm->prepare_deploy;
    ok(
-      -f catfile(qw( t sql SQLite deploy 3.0 001-auto.sql )),
+      -f catfile(splitdir($sql_dir), qw(SQLite deploy 3.0 001-auto.sql )),
       '2.0 schema gets generated properly'
    );
    $dm->prepare_downgrade({
@@ -214,7 +212,7 @@ VERSION3: {
      version_set => [$version, '1.0']
    });
    ok(
-      -f catfile(qw( t sql SQLite downgrade 3.0-1.0 001-auto.sql )),
+      -f catfile(splitdir($sql_dir), qw(SQLite downgrade 3.0-1.0 001-auto.sql )),
       '3.0-1.0 diff gets generated properly'
    );
    $dm->prepare_upgrade({
@@ -223,7 +221,7 @@ VERSION3: {
      version_set => ['1.0', $version]
    });
    ok(
-      -f catfile(qw( t sql SQLite upgrade 1.0-3.0 001-auto.sql )),
+      -f catfile(splitdir($sql_dir), qw(SQLite upgrade 1.0-3.0 001-auto.sql )),
       '1.0-3.0 diff gets generated properly'
    );
    $dm->prepare_upgrade({
@@ -240,7 +238,7 @@ VERSION3: {
       }
    'prepare_upgrade dies if you clobber an existing upgrade file' ;
    ok(
-      -f catfile(qw( t sql SQLite upgrade 1.0-2.0 001-auto.sql )),
+      -f catfile(splitdir($sql_dir), qw(SQLite upgrade 1.0-2.0 001-auto.sql )),
       '2.0-3.0 diff gets generated properly'
    );
    dies_ok {