X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fdeploy_methods%2Fsql_translator.t;h=49b2c16bb079377e22852ed1395ebc3393880265;hb=ff40cb1f9761e5118c2042e7b6f7e8bb947bd20a;hp=2d5607d9645c80fea155ebc951b760fee437bbfb;hpb=fc4b7602052e267368ca63a07f882be01a2ba8a7;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/deploy_methods/sql_translator.t b/t/deploy_methods/sql_translator.t
index 2d5607d..49b2c16 100644
--- a/t/deploy_methods/sql_translator.t
+++ b/t/deploy_methods/sql_translator.t
@@ -20,7 +20,7 @@ VERSION1: {
    my $s = DBICVersion::Schema->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
-      upgrade_directory => $sql_dir,
+      script_directory => $sql_dir,
       databases         => ['SQLite'],
       sql_translator_args          => { add_drop_table => 0 },
    });
@@ -29,12 +29,12 @@ 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 ));
-   print {$prerun} "sub run {use File::Touch; touch(q(foobar));}";
+      catfile(qw( t sql SQLite initialize 1.0 003-semiautomatic.pl ));
+   print {$prerun} "sub {use File::Touch; touch(q(foobar));}";
    close $prerun;
-   $dm->preinstall_scripts('1.0');
+   $dm->initialize({ version => '1.0' });
 
    ok -e 'foobar';
 
@@ -44,14 +44,9 @@ VERSION1: {
       $dm->prepare_deploy;
       ok( $warned, 'prepare_deploy warns if you run it twice' );
    }
-   mkpath(catfile(qw( t sql _common schema 1.0 )));
-   open my $common, '>',
-      catfile(qw( t sql _common schema 1.0 002-error.sql ));
-   print {$common} qq<syntax fail\n\n>;
-   close $common;
 
    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'
    );
 
@@ -61,17 +56,7 @@ VERSION1: {
       })
    } 'schema not deployed';
 
-   mkpath catfile(qw( t sql _common schema 1.0 ));
-   open $common, '>',
-      catfile(qw( t sql _common schema 1.0 001-auto.sql ));
-   print {$common} qq<This will never get run>;
-   close $common;
-   {
-      my $warned = 0;
-      local $SIG{__WARN__} = sub{$warned = 1};
-      $dm->deploy;
-      ok( $warned, 'deploy warns on sql errors' );
-   }
+   $dm->deploy;
 
    lives_ok {
       $s->resultset('Foo')->create({
@@ -85,7 +70,7 @@ VERSION2: {
    my $s = DBICVersion::Schema->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
-      upgrade_directory => $sql_dir,
+      script_directory => $sql_dir,
       databases         => ['SQLite'],
       sql_translator_args          => { add_drop_table => 0 },
       txn_wrap          => 1,
@@ -96,26 +81,38 @@ VERSION2: {
    $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 )));
-   $dm->prepare_upgrade(qw(1.0 2.0), [qw(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',
+     version_set => [qw(1.0 2.0)]
+   });
 
    {
       my $warned = 0;
       local $SIG{__WARN__} = sub{$warned = 1};
-      $dm->prepare_upgrade(qw(0.0 1.0), [qw(0.0 1.0)]);
+      $dm->prepare_upgrade({
+        from_version => '0.0',
+        to_version => '1.0',
+        version_set => [qw(0.0 1.0)]
+      });
       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 )));
-   $dm->prepare_downgrade($version, '1.0', [$version, '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 {
@@ -131,16 +128,16 @@ 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 run {
+      sub {
          my $schema = shift;
          $schema->resultset('Foo')->create({
             bar => 'goodbye',
@@ -150,7 +147,7 @@ VERSION2: {
    |;
    close $common_pl;
 
-   $dm->upgrade_single_step([qw( 1.0 2.0 )]);
+   $dm->upgrade_single_step({ version_set => [qw( 1.0 2.0 )] });
    is( $s->resultset('Foo')->search({
          bar => 'hello',
          baz => 'world',
@@ -165,14 +162,14 @@ VERSION2: {
          baz => 'frew',
       })
    } 'schema is deployed';
-   $dm->downgrade_single_step([qw( 2.0 1.0 )]);
+   $dm->downgrade_single_step({ version_set => [qw( 2.0 1.0 )] });
    dies_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
          baz => 'frew',
       })
    } 'schema is downgrayyed';
-   $dm->upgrade_single_step([qw( 1.0 2.0 )]);
+   $dm->upgrade_single_step({ version_set => [qw( 1.0 2.0 )] });
 }
 
 VERSION3: {
@@ -180,7 +177,7 @@ VERSION3: {
    my $s = DBICVersion::Schema->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
-      upgrade_directory => $sql_dir,
+      script_directory => $sql_dir,
       databases         => ['SQLite'],
       sql_translator_args          => { add_drop_table => 0 },
       txn_wrap          => 0,
@@ -191,34 +188,46 @@ VERSION3: {
    $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($version, '1.0', [$version, '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 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( '1.0', $version, ['1.0', $version] );
+   $dm->prepare_upgrade({
+     from_version => '1.0',
+     to_version => $version,
+     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( '2.0', $version, ['2.0', $version]);
+   $dm->prepare_upgrade({
+     from_version => '2.0',
+     to_version => $version,
+     version_set => ['2.0', $version]
+   });
    {
       my $warned = 0;
       local $SIG{__WARN__} = sub{$warned = 1};
-      $dm->prepare_upgrade( '2.0', $version, ['2.0', $version] );
+      $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' );
    }
    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'
    );
-   mkpath catfile(qw( t sql _generic up 2.0-3.0 ));
-   rename catfile(qw( t sql SQLite up 2.0-3.0 001-auto.sql )), catfile(qw( t sql _generic up 2.0-3.0 001-auto.sql ));
-   rmtree(catfile(qw( t sql SQLite )));
-   warn 'how can this be' if -d catfile(qw( t sql SQLite ));
    dies_ok {
       $s->resultset('Foo')->create({
             bar => 'frew',
@@ -226,18 +235,16 @@ VERSION3: {
             biff => 'frew',
          })
    } 'schema not deployed';
-   $dm->upgrade_single_step([qw( 2.0 3.0 )]);
+   $dm->upgrade_single_step({ version_set => [qw( 2.0 3.0 )] });
    lives_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
          baz => 'frew',
          biff => 'frew',
       })
-   } 'schema is deployed using _generic';
-   rmtree(catfile(qw( t sql SQLite )));
-   rmtree(catfile(qw( t sql _generic )));
+   } 'schema is deployed';
    dies_ok {
-      $dm->upgrade_single_step([qw( 2.0 3.0 )]);
+      $dm->upgrade_single_step({ version_set => [qw( 2.0 3.0 )] });
    } 'dies when sql dir does not exist';
 }
 done_testing;