X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-instantiation.t;h=82acd105aa22572c062fe33d1d5d5be43387c187;hb=76d311e71dd647d82d18271d12e86baf11f5e525;hp=b4da432dd6a532fdec6bc2f60438c3603d41fb92;hpb=4ea147c61b35f316efb6482e4becf4b5bfcff312;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index b4da432..82acd10 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -2,115 +2,125 @@
 
 use Test::More;
 use Test::Exception;
+use File::Path 'remove_tree';
 
 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';
 
+DBICDHTest::ready;
+
 VERSION1: {
-	use_ok 'DBICVersion_v1';
-	my $s = DBICVersion::Schema->connect($db);
-	ok($s, 'DBICVersion::Schema 1.0 instantiates correctly');
-	my $handler = DBIx::Class::DeploymentHandler->new({
-		upgrade_directory => $sql_dir,
-		schema => $s,
-	});
+   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');
+   ok($handler, 'DBIx::Class::DeploymentHandler w/1.0 instantiates correctly');
 
-	my $version = $s->schema_version();
-	$handler->create_ddl_dir( 'SQLite', $version, $sql_dir, 0);
-	ok(-e 't/sql/DBICVersion-Schema-1.0-SQLite.sql', 'DDL for 1.0 got created successfully');
+   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';
+   dies_ok {
+      $s->resultset('Foo')->create({
+         bar => 'frew',
+      })
+   } 'schema not deployed';
+   $handler->install;
+   lives_ok {
+      $s->resultset('Foo')->create({
+         bar => 'frew',
+      })
+   } 'schema is deployed';
 }
 
 VERSION2: {
-	use_ok 'DBICVersion_v2';
-	my $s = DBICVersion::Schema->connect($db);
-	ok($s, 'DBICVersion::Schema 2.0 instantiates correctly');
-	my $handler = DBIx::Class::DeploymentHandler->new({
-		upgrade_directory => $sql_dir,
-		schema => $s,
-	});
+   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');
+   ok($handler, 'DBIx::Class::DeploymentHandler w/2.0 instantiates correctly');
 
-	$version = $s->schema_version();
-	$handler->create_ddl_dir( 'SQLite', $version, $sql_dir, 0);
-	$handler->create_ddl_dir( 'SQLite', $version, $sql_dir, '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');
-	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_single_step('1.0', '2.0');
-	lives_ok {
-		$s->resultset('Foo')->create({
-			bar => 'frew',
-			baz => 'frew',
-		})
-	} 'schema is deployed';
+   $version = $s->schema_version();
+   $handler->prepare_install();
+   $handler->prepare_upgrade('1.0', $version);
+   $handler->prepare_upgrade($version, '1.0');
+   #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';
 }
 
 VERSION3: {
-	use_ok 'DBICVersion_v3';
-	my $s = DBICVersion::Schema->connect($db);
-	ok($s, 'DBICVersion::Schema 3.0 instantiates correctly');
-	my $handler = DBIx::Class::DeploymentHandler->new({
-		upgrade_directory => $sql_dir,
-		schema => $s,
-	});
+   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');
+   ok($handler, 'DBIx::Class::DeploymentHandler w/3.0 instantiates correctly');
 
-	$version = $s->schema_version();
-	$handler->create_ddl_dir( 'SQLite', $version, $sql_dir, 0);
-	$handler->create_ddl_dir( 'SQLite', $version, $sql_dir, '1.0');
-	$handler->create_ddl_dir( 'SQLite', $version, $sql_dir, '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');
-	dies_ok {
-		$s->resultset('Foo')->create({
-				bar => 'frew',
-				baz => 'frew',
-				biff => 'frew',
-			})
-	} 'schema not deployed';
-	$handler->upgrade_single_step('2.0', '3.0');
-	lives_ok {
-		$s->resultset('Foo')->create({
-			bar => 'frew',
-			baz => 'frew',
-			biff => 'frew',
-		})
-	} 'schema is deployed';
+   $version = $s->schema_version();
+   $handler->prepare_install;
+   $handler->prepare_upgrade( '1.0', $version );
+   $handler->prepare_upgrade( '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',
+      })
+   } 'schema is deployed';
 }
 
 done_testing;
 __END__
 
-vim: ts=2,sw=2,expandtab
+vim: ts=2 sw=2 expandtab