tiny bits of cleanup

[dbsrgits/DBIx-Class-DeploymentHandler.git] / t / deploy_methods / sql_translator.t

diff --git a/t/deploy_methods/sql_translator.t b/t/deploy_methods/sql_translator.t
index 779867d..eca08c8 100644 (file)
--- a/t/deploy_methods/sql_translator.t
+++ b/t/deploy_methods/sql_translator.t
@@ -78,23 +78,24 @@ VERSION2: {
       upgrade_directory => $sql_dir,
       databases         => ['SQLite'],
       sqltargs          => { add_drop_table => 0 },
+               txn_wrap          => 1,
    });
 
    ok( $dm, 'DBIC::DH::SQL::Translator w/2.0 instantiates correctly');
 
    $version = $s->schema_version();
-   $dm->prepare_install();
+   $dm->prepare_install;
    ok(
       -f catfile(qw( t sql SQLite schema 2.0 001-auto.sql )),
       '2.0 schema gets generated properly'
    );
    mkpath(catfile(qw( t sql SQLite up 1.0-2.0 )));
-   $dm->prepare_upgrade;
+   $dm->prepare_upgrade(qw(1.0 2.0), [qw(1.0 2.0)]);
 
    {
       my $warned = 0;
       local $SIG{__WARN__} = sub{$warned = 1};
-      $dm->prepare_upgrade('0.0', '1.0');
+      $dm->prepare_upgrade(qw(0.0 1.0), [qw(0.0 1.0)]);
       ok( $warned, 'prepare_upgrade with a bogus preversion warns' );
    }
    ok(
@@ -102,7 +103,7 @@ VERSION2: {
       '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 )));
-   $dm->prepare_downgrade($version, '1.0');
+   $dm->prepare_downgrade($version, '1.0', [$version, '1.0']);
    ok(
       -f catfile(qw( t sql SQLite down 2.0-1.0 001-auto.sql )),
       '2.0-1.0 diff gets generated properly'
@@ -126,11 +127,28 @@ VERSION2: {
    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 ));
+   print {$common_pl} q|
+               sub run {
+                       my $schema = shift;
+                       $schema->resultset('Foo')->create({
+                               bar => 'goodbye',
+                               baz => 'blue skies',
+                       })
+               }
+       |;
+   close $common_pl;
+
    $dm->upgrade_single_step([qw( 1.0 2.0 )]);
    is( $s->resultset('Foo')->search({
          bar => 'hello',
          baz => 'world',
       })->count, 1, '_common migration got run');
+   is( $s->resultset('Foo')->search({
+         bar => 'goodbye',
+         #baz => 'blue skies',
+      })->count, 1, '_common perl migration got run');
    lives_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -166,7 +184,7 @@ VERSION3: {
       -f catfile(qw( t sql SQLite schema 3.0 001-auto.sql )),
       '2.0 schema gets generated properly'
    );
-   $dm->prepare_downgrade($version, '1.0');
+   $dm->prepare_downgrade($version, '1.0', [$version, '1.0']);
    ok(
       -f catfile(qw( t sql SQLite down 3.0-1.0 001-auto.sql )),
       '3.0-1.0 diff gets generated properly'
@@ -176,11 +194,11 @@ VERSION3: {
       -f catfile(qw( t sql SQLite up 1.0-3.0 001-auto.sql )),
       '1.0-3.0 diff gets generated properly'
    );
-   $dm->prepare_upgrade( '2.0', $version );
+   $dm->prepare_upgrade( '2.0', $version, ['2.0', $version]);
    {
       my $warned = 0;
       local $SIG{__WARN__} = sub{$warned = 1};
-      $dm->prepare_upgrade( '2.0', $version );
+      $dm->prepare_upgrade( '2.0', $version, ['2.0', $version] );
       ok( $warned, 'prepare_upgrade warns if you clobber an existing upgrade file' );
    }
    ok(