X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fdeploy_methods%2Fsql_translator.t;h=614c6c0d21fd045d940c354c0801e0884f8aa3b9;hb=refs%2Fheads%2Fmigration_schema;hp=bbb9845c20f93175b5ff87522a227c3dda02906f;hpb=5b766a244ca1fe004b66adb51b1a42c08bd2b373;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/deploy_methods/sql_translator.t b/t/deploy_methods/sql_translator.t
index bbb9845..614c6c0 100644
--- a/t/deploy_methods/sql_translator.t
+++ b/t/deploy_methods/sql_translator.t
@@ -1,5 +1,8 @@
 #!perl
 
+use strict;
+use warnings;
+
 use Test::More;
 use Test::Exception;
 
@@ -9,15 +12,32 @@ use aliased 'DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator';
 use File::Spec::Functions;
 use File::Path qw(rmtree mkpath);
 
-my $db = 'dbi:SQLite:db.db';
-my @connection = ($db, '', '', { ignore_version => 1 });
+my $dbh = DBICDHTest::dbh();
+my @connection = (sub { $dbh }, { ignore_version => 1 });
 my $sql_dir = 't/sql';
 
 DBICDHTest::ready;
+unlink 'stuffthatran';
+
+for (qw(initialize upgrade downgrade deploy)) {
+   mkpath(catfile(qw( t sql _common),  $_, '_any' ));
+   open my $fh, '>',
+      catfile(qw( t sql _common), $_, qw(_any 000-win.pl ));
+   print {$fh} 'sub {open my $fh, ">>", "stuffthatran"; use Data::Dumper::Concise; print {$fh} join(",", @{$_[1]||[]}) . "\n";  }';
+   close $fh;
+}
+
+for (qw(initialize upgrade downgrade deploy)) {
+   mkpath(catfile(qw( t sql SQLite),  $_, '_any' ));
+   open my $fh, '>',
+      catfile(qw( t sql SQLite), $_, qw(_any 000-win2.pl ));
+   print {$fh} 'sub {open my $fh, ">>", "stuffthatran"; use Data::Dumper::Concise; print {$fh} join(",", @{$_[1]||[]}) . "\n";  }';
+   close $fh;
+}
 
 VERSION1: {
    use_ok 'DBICVersion_v1';
-   my $s = DBICVersion::Schema->connect(@connection);
+   my $s = DBICVersion::Schema1->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
       script_directory => $sql_dir,
@@ -29,24 +49,19 @@ VERSION1: {
 
    $dm->prepare_deploy;
 
-   mkpath(catfile(qw( t sql SQLite preinstall 1.0 )));
+   mkpath(catfile(qw( t sql SQLite initialize 1.0 )));
    open my $prerun, '>',
-      catfile(qw( t sql SQLite preinstall 1.0 003-semiautomatic.pl ));
+      catfile(qw( t sql SQLite initialize 1.0 003-semiautomatic.pl ));
    print {$prerun} "sub {use File::Touch; touch(q(foobar));}";
    close $prerun;
-   $dm->preinstall({ version => '1.0' });
+   $dm->initialize({ version => '1.0' });
 
-   ok -e 'foobar';
+   ok -e 'foobar', 'code got run in preinit';
 
-   {
-      my $warned = 0;
-      local $SIG{__WARN__} = sub{$warned = 1};
-      $dm->prepare_deploy;
-      ok( $warned, 'prepare_deploy warns if you run it twice' );
-   }
+   dies_ok {$dm->prepare_deploy} 'prepare_deploy dies if you run it twice' ;
 
    ok(
-      -f catfile(qw( t sql SQLite schema 1.0 001-auto.sql )),
+      -f catfile(qw( t sql SQLite deploy 1.0 001-auto.sql )),
       '1.0 schema gets generated properly'
    );
 
@@ -67,7 +82,7 @@ VERSION1: {
 
 VERSION2: {
    use_ok 'DBICVersion_v2';
-   my $s = DBICVersion::Schema->connect(@connection);
+   my $s = DBICVersion::Schema2->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
       script_directory => $sql_dir,
@@ -78,13 +93,13 @@ VERSION2: {
 
    ok( $dm, 'DBIC::DH::SQL::Translator w/2.0 instantiates correctly');
 
-   $version = $s->schema_version();
+   my $version = $s->schema_version();
    $dm->prepare_deploy;
    ok(
-      -f catfile(qw( t sql SQLite schema 2.0 001-auto.sql )),
+      -f catfile(qw( t sql SQLite deploy 2.0 001-auto.sql )),
       '2.0 schema gets generated properly'
    );
-   mkpath(catfile(qw( t sql SQLite up 1.0-2.0 )));
+   mkpath(catfile(qw( t sql SQLite upgrade 1.0-2.0 )));
    $dm->prepare_upgrade({
      from_version => '1.0',
      to_version => '2.0',
@@ -102,17 +117,17 @@ VERSION2: {
       ok( $warned, 'prepare_upgrade with a bogus preversion warns' );
    }
    ok(
-      -f catfile(qw( t sql SQLite up 1.0-2.0 001-auto.sql )),
+      -f catfile(qw( t sql 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 down 2.0-1.0 )));
+   mkpath(catfile(qw( t sql 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 down 2.0-1.0 001-auto.sql )),
+      -f catfile(qw( t sql SQLite downgrade 2.0-1.0 001-auto.sql )),
       '2.0-1.0 diff gets generated properly'
    );
    dies_ok {
@@ -128,14 +143,14 @@ VERSION2: {
       })
    } 'schema not uppgrayyed';
 
-   mkpath catfile(qw( t sql _common up 1.0-2.0 ));
+   mkpath catfile(qw( t sql _common upgrade 1.0-2.0 ));
    open my $common, '>',
-      catfile(qw( t sql _common up 1.0-2.0 002-semiautomatic.sql ));
+      catfile(qw( t sql _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 up 1.0-2.0 003-semiautomatic.pl ));
+      catfile(qw( t sql _common upgrade 1.0-2.0 003-semiautomatic.pl ));
    print {$common_pl} q|
       sub {
          my $schema = shift;
@@ -174,7 +189,7 @@ VERSION2: {
 
 VERSION3: {
    use_ok 'DBICVersion_v3';
-   my $s = DBICVersion::Schema->connect(@connection);
+   my $s = DBICVersion::Schema3->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
       script_directory => $sql_dir,
@@ -185,10 +200,10 @@ VERSION3: {
 
    ok( $dm, 'DBIC::DH::SQL::Translator w/3.0 instantiates correctly');
 
-   $version = $s->schema_version();
+   my $version = $s->schema_version();
    $dm->prepare_deploy;
    ok(
-      -f catfile(qw( t sql SQLite schema 3.0 001-auto.sql )),
+      -f catfile(qw( t sql SQLite deploy 3.0 001-auto.sql )),
       '2.0 schema gets generated properly'
    );
    $dm->prepare_downgrade({
@@ -197,7 +212,7 @@ VERSION3: {
      version_set => [$version, '1.0']
    });
    ok(
-      -f catfile(qw( t sql SQLite down 3.0-1.0 001-auto.sql )),
+      -f catfile(qw( t sql SQLite downgrade 3.0-1.0 001-auto.sql )),
       '3.0-1.0 diff gets generated properly'
    );
    $dm->prepare_upgrade({
@@ -206,7 +221,7 @@ VERSION3: {
      version_set => ['1.0', $version]
    });
    ok(
-      -f catfile(qw( t sql SQLite up 1.0-3.0 001-auto.sql )),
+      -f catfile(qw( t sql SQLite upgrade 1.0-3.0 001-auto.sql )),
       '1.0-3.0 diff gets generated properly'
    );
    $dm->prepare_upgrade({
@@ -214,18 +229,16 @@ VERSION3: {
      to_version => $version,
      version_set => ['2.0', $version]
    });
-   {
-      my $warned = 0;
-      local $SIG{__WARN__} = sub{$warned = 1};
+   dies_ok {
       $dm->prepare_upgrade({
         from_version => '2.0',
         to_version => $version,
         version_set => ['2.0', $version]
       });
-      ok( $warned, 'prepare_upgrade warns if you clobber an existing upgrade file' );
-   }
+      }
+   'prepare_upgrade dies if you clobber an existing upgrade file' ;
    ok(
-      -f catfile(qw( t sql SQLite up 1.0-2.0 001-auto.sql )),
+      -f catfile(qw( t sql SQLite upgrade 1.0-2.0 001-auto.sql )),
       '2.0-3.0 diff gets generated properly'
    );
    dies_ok {
@@ -243,9 +256,31 @@ VERSION3: {
          biff => 'frew',
       })
    } 'schema is deployed';
-   dies_ok {
-      $dm->upgrade_single_step({ version_set => [qw( 2.0 3.0 )] });
-   } 'dies when sql dir does not exist';
+   ## This doesn't die now with the SQLT fixes
+   #dies_ok {
+   #   $dm->upgrade_single_step({ version_set => [qw( 2.0 3.0 )] });
+   #} 'dies when sql dir does not exist';
+   #
+   $dm->upgrade_single_step({ version_set => [qw( 2.0 3.0 )] });
 }
+
+my $stuff_that_ran = do { local( @ARGV, $/ ) = 'stuffthatran'; <> };
+is $stuff_that_ran,
+'
+
+1.0
+1.0
+1.0,2.0
+1.0,2.0
+2.0,1.0
+2.0,1.0
+1.0,2.0
+1.0,2.0
+2.0,3.0
+2.0,3.0
+2.0,3.0
+2.0,3.0
+', '_any got ran the right amount of times with the right args';
+
 done_testing;
 #vim: ts=2 sw=2 expandtab