X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-instantiation.t;h=7d673099496fe15df9ba8e5772af1da887caa007;hb=aa5ad00e656c25a27bb08df4443ec0adecc7c524;hp=57e141a82dbee64cef9d4a67d3713552d510f239;hpb=b9c4146b78c5485de4c363de99e24dd1994f7627;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 57e141a..7d67309 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -2,31 +2,37 @@
 
 use Test::More;
 use Test::Exception;
+use File::Path 'remove_tree';
 
 use lib 't/lib';
 use DBICTest;
 use DBIx::Class::DeploymentHandler;
 my $db = 'dbi:SQLite:db.db';
+my @connection = ($db, '', '', { ignore_version => 1 });
 my $sql_dir = 't/sql';
 
 unlink 'db.db' if -e 'db.db';
-mkdir 't/sql' unless -d 't/sql';
+if (-d 't/sql') {
+  remove_tree('t/sql');
+  mkdir 't/sql';
+}
 
 VERSION1: {
    use_ok 'DBICVersion_v1';
-   my $s = DBICVersion::Schema->connect($db);
+   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'],
+      databases => 'SQLite',
+    sqltargs => { add_drop_table => 0 },
    });
 
    ok($handler, 'DBIx::Class::DeploymentHandler w/1.0 instantiates correctly');
 
    my $version = $s->schema_version();
-   $handler->create_ddl_dir( $version, 0);
-   ok(-e 't/sql/DBICVersion-Schema-1.0-SQLite.sql', 'DDL for 1.0 got created successfully');
+   $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({
@@ -43,21 +49,21 @@ VERSION1: {
 
 VERSION2: {
    use_ok 'DBICVersion_v2';
-   my $s = DBICVersion::Schema->connect($db);
+   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'],
+      databases => 'SQLite',
    });
 
    ok($handler, 'DBIx::Class::DeploymentHandler w/2.0 instantiates correctly');
 
    $version = $s->schema_version();
-   $handler->create_ddl_dir($version, 0);
-   $handler->create_ddl_dir($version, '1.0');
-   ok(-e 't/sql/DBICVersion-Schema-2.0-SQLite.sql', 'DDL for 2.0 got created successfully');
-   ok(-e 't/sql/DBICVersion-Schema-1.0-2.0-SQLite.sql', 'DDL for migration from 1.0 to 2.0 got created successfully');
+   $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',
@@ -71,7 +77,7 @@ VERSION2: {
          baz => 'frew',
       })
    } 'schema not uppgrayyed';
-   $handler->upgrade_single_step('1.0', '2.0');
+   $handler->upgrade;
    lives_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -82,23 +88,23 @@ VERSION2: {
 
 VERSION3: {
    use_ok 'DBICVersion_v3';
-   my $s = DBICVersion::Schema->connect($db);
+   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'],
+      databases => 'SQLite',
    });
 
    ok($handler, 'DBIx::Class::DeploymentHandler w/3.0 instantiates correctly');
 
    $version = $s->schema_version();
-   $handler->create_ddl_dir( $version, 0);
-   $handler->create_ddl_dir( $version, '1.0');
-   $handler->create_ddl_dir( $version, '2.0');
-   ok(-e 't/sql/DBICVersion-Schema-3.0-SQLite.sql', 'DDL for 3.0 got created successfully');
-   ok(-e 't/sql/DBICVersion-Schema-1.0-3.0-SQLite.sql', 'DDL for migration from 1.0 to 3.0 got created successfully');
-   ok(-e 't/sql/DBICVersion-Schema-2.0-3.0-SQLite.sql', 'DDL for migration from 2.0 to 3.0 got created successfully');
+   $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',
@@ -119,4 +125,4 @@ VERSION3: {
 done_testing;
 __END__
 
-vim: ts=2,sw=2,expandtab
+vim: ts=2 sw=2 expandtab