X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-instantiation.t;h=7a2753a3955c24e18b8cac02fe80030f45c27c4d;hb=cdb45dee99a52a37f6e61bfbec2e4af8f3a59f51;hp=a401ec1df57182725cbd424f93f4464171883488;hpb=02d58ac05dd4ccbe5fd4ff8a9cc58681ee1b74ee;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index a401ec1..7a2753a 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -1,125 +1,163 @@
 #!perl
 
-use Test::More;
-use Test::Exception;
-use File::Path 'remove_tree';
+use strict;
+use warnings;
 
 use lib 't/lib';
 use DBICDHTest;
-use DBICTest;
 use DBIx::Class::DeploymentHandler;
-my $db = 'dbi:SQLite:db.db';
-my @connection = ($db, '', '', { ignore_version => 1 });
-my $sql_dir = 't/sql';
+use aliased 'DBIx::Class::DeploymentHandler', 'DH';
+
+use File::Path 'remove_tree';
+use Test::More;
+use Test::Exception;
 
 DBICDHTest::ready;
 
+my $dbh = DBICDHTest::dbh();
+my @connection = (sub { $dbh }, { ignore_version => 1 });
+my $sql_dir = 't/sql';
+
 VERSION1: {
-   use_ok 'DBICVersion_v1';
-   my $s = DBICVersion::Schema->connect(@connection);
-   ok($s, 'DBICVersion::Schema 1.0 instantiates correctly');
-   my $handler = DBIx::Class::DeploymentHandler->new({
-      upgrade_directory => $sql_dir,
-      schema => $s,
-      databases => 'SQLite',
-    sqltargs => { add_drop_table => 0 },
-   });
-
-   ok($handler, 'DBIx::Class::DeploymentHandler w/1.0 instantiates correctly');
-
-   my $version = $s->schema_version();
-   $handler->prepare_install();
-   #ok(-e 't/sql/DBICVersion-Schema-schema-1.0-SQLite.sql', 'DDL for 1.0 got created successfully');
-
-   dies_ok {
-      $s->resultset('Foo')->create({
-         bar => 'frew',
-      })
-   } 'schema not deployed';
-   $handler->install;
-   lives_ok {
-      $s->resultset('Foo')->create({
-         bar => 'frew',
-      })
-   } 'schema is deployed';
+  use_ok 'DBICVersion_v1';
+  my $s = DBICVersion::Schema1->connect(@connection);
+  $DBICVersion::Schema1::VERSION = 1;
+  ok($s, 'DBICVersion::Schema 1 instantiates correctly');
+  my $handler = DH->new({
+    script_directory => $sql_dir,
+    schema => $s,
+    databases => 'SQLite',
+    sql_translator_args => { add_drop_table => 0 },
+  });
+
+  ok($handler, 'DBIx::Class::DeploymentHandler w/1 instantiates correctly');
+
+  my $version = $s->schema_version;
+  $handler->prepare_install;
+
+  dies_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+    })
+  } 'schema not deployed';
+  $handler->install;
+  dies_ok {
+    $handler->install;
+  } 'cannot install twice';
+  lives_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+    })
+  } 'schema is deployed';
 }
 
 VERSION2: {
-   use_ok 'DBICVersion_v2';
-   my $s = DBICVersion::Schema->connect(@connection);
-   ok($s, 'DBICVersion::Schema 2.0 instantiates correctly');
-   my $handler = DBIx::Class::DeploymentHandler->new({
-      upgrade_directory => $sql_dir,
-      schema => $s,
-      databases => 'SQLite',
-   });
-
-   ok($handler, 'DBIx::Class::DeploymentHandler w/2.0 instantiates correctly');
-
-   $version = $s->schema_version();
-   $handler->prepare_install();
-   $handler->prepare_update('1.0', $version);
-   #ok(-e 't/sql/DBICVersion-Schema-schema-2.0-SQLite.sql', 'DDL for 2.0 got created successfully');
-   #ok(-e 't/sql/DBICVersion-Schema-diff-1.0-2.0-SQLite.sql', 'DDL for migration from 1.0 to 2.0 got created successfully');
-   dies_ok {
-      $s->resultset('Foo')->create({
-         bar => 'frew',
-         baz => 'frew',
-      })
-   } 'schema not deployed';
-   #$handler->install('1.0');
-   dies_ok {
-      $s->resultset('Foo')->create({
-         bar => 'frew',
-         baz => 'frew',
-      })
-   } 'schema not uppgrayyed';
-   $handler->upgrade;
-   lives_ok {
-      $s->resultset('Foo')->create({
-         bar => 'frew',
-         baz => 'frew',
-      })
-   } 'schema is deployed';
+  use_ok 'DBICVersion_v2';
+  my $s = DBICVersion::Schema2->connect(@connection);
+  $DBICVersion::Schema2::VERSION = 2;
+  ok($s, 'DBICVersion::Schema 2 instantiates correctly');
+  my $handler = DH->new({
+    script_directory => $sql_dir,
+    schema => $s,
+    databases => 'SQLite',
+  });
+
+  ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
+
+  my $version = $s->schema_version();
+  $handler->prepare_install;
+  $handler->prepare_upgrade({ from_version => 1, to_version => $version} );
+  dies_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+    })
+  } 'schema not deployed';
+  dies_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+    })
+  } 'schema not uppgrayyed';
+  $handler->upgrade;
+  lives_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+    })
+  } 'schema is deployed';
 }
 
 VERSION3: {
-   use_ok 'DBICVersion_v3';
-   my $s = DBICVersion::Schema->connect(@connection);
-   ok($s, 'DBICVersion::Schema 3.0 instantiates correctly');
-   my $handler = DBIx::Class::DeploymentHandler->new({
-      upgrade_directory => $sql_dir,
-      schema => $s,
-      databases => 'SQLite',
-   });
-
-   ok($handler, 'DBIx::Class::DeploymentHandler w/3.0 instantiates correctly');
-
-   $version = $s->schema_version();
-   $handler->prepare_install;
-   $handler->prepare_update( '1.0', $version );
-   $handler->prepare_update( '2.0', $version );
-   #ok(-e 't/sql/DBICVersion-Schema-schema-3.0-SQLite.sql', 'DDL for 3.0 got created successfully');
-   #ok(-e 't/sql/DBICVersion-Schema-diff-1.0-3.0-SQLite.sql', 'DDL for migration from 1.0 to 3.0 got created successfully');
-   #ok(-e 't/sql/DBICVersion-Schema-diff-2.0-3.0-SQLite.sql', 'DDL for migration from 2.0 to 3.0 got created successfully');
-   dies_ok {
-      $s->resultset('Foo')->create({
-            bar => 'frew',
-            baz => 'frew',
-            biff => 'frew',
-         })
-   } 'schema not deployed';
-   $handler->upgrade;
-   lives_ok {
-      $s->resultset('Foo')->create({
-         bar => 'frew',
-         baz => 'frew',
-         biff => 'frew',
+  use_ok 'DBICVersion_v3';
+  my $s = DBICVersion::Schema3->connect(@connection);
+  $DBICVersion::Schema3::VERSION = 3;
+  ok($s, 'DBICVersion::Schema 3 instantiates correctly');
+  my $handler = DH->new({
+    script_directory => $sql_dir,
+    schema => $s,
+    databases => 'SQLite',
+  });
+
+  ok($handler, 'DBIx::Class::DeploymentHandler w/3 instantiates correctly');
+
+  my $version = $s->schema_version();
+  $handler->prepare_install;
+  $handler->prepare_upgrade({ from_version => 2, to_version => $version });
+  dies_ok {
+    $s->resultset('Foo')->create({
+        bar => 'frew',
+        baz => 'frew',
+        biff => 'frew',
       })
-   } 'schema is deployed';
+  } 'schema not deployed';
+  $handler->upgrade;
+  lives_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+      biff => 'frew',
+    })
+  } 'schema is deployed';
 }
 
-done_testing;
-__END__
+DOWN2: {
+  use_ok 'DBICVersion_v4';
+  my $s_old = DBICVersion::Schema3->connect(@connection);
+  my $s_new = DBICVersion::Schema4->connect(@connection);
+  $DBICVersion::Schema4::VERSION = 2;
+  ok($s_new, 'DBICVersion::Schema 2 instantiates correctly');
+  my $handler = DH->new({
+    script_directory => $sql_dir,
+    schema => $s_new,
+    databases => 'SQLite',
+  });
+
+  ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
 
-vim: ts=2 sw=2 expandtab
+  my $version = $s_new->schema_version();
+  $handler->prepare_downgrade({ from_version => 3, to_version => $version });
+  lives_ok {
+    $s_old->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+      biff => 'frew',
+    })
+  } 'schema at version 3';
+  $handler->downgrade;
+  dies_ok {
+    $s_old->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+      biff => 'frew',
+    })
+  } 'schema not at version 3';
+  lives_ok {
+    $s_new->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+    })
+  } 'schema is at version 2';
+}
+
+done_testing;