X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fadmin%2F02ddl.t;h=8b1c57fc2d2ca28ae56eda711c8181d333ba3cba;hb=8d6b1478d8fa6f7c76e313ee72a72d5eb4c24d03;hp=763139047329b708c5f96ea48535cb8377bd27dd;hpb=9f3849c3c386bcf4adb7b13d9e2f7ca2b18047c7;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/admin/02ddl.t b/t/admin/02ddl.t
index 7631390..8b1c57f 100644
--- a/t/admin/02ddl.t
+++ b/t/admin/02ddl.t
@@ -1,82 +1,131 @@
-#
-#===============================================================================
-#
-#         FILE:  02admin..t
-#
-#  DESCRIPTION:  
-#
-#        FILES:  ---
-#         BUGS:  ---
-#        NOTES:  ---
-#       AUTHOR:  Gordon Irving (), <Gordon.irving@sophos.com>
-#      COMPANY:  Sophos
-#      VERSION:  1.0
-#      CREATED:  28/11/09 16:14:21 GMT
-#     REVISION:  ---
-#===============================================================================
-
 use strict;
 use warnings;
 
-use Test::More;                      # last test to print
-
+use Test::More;
 use Test::Exception;
+use Test::Warn;
 
 use Path::Class;
-use FindBin qw($Bin);
-use lib dir($Bin,'..', '..','lib')->stringify;
-use lib dir($Bin,'..', 'lib')->stringify;
-
-use ok 'DBIx::Class::Admin';
 
+use lib qw(t/lib);
 use DBICTest;
 
-my $sql_dir = dir($Bin,"var","sql");
+BEGIN {
+    require DBIx::Class;
+    plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('admin')
+      unless DBIx::Class::Optional::Dependencies->req_ok_for('admin');
+
+    plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('deploy')
+      unless DBIx::Class::Optional::Dependencies->req_ok_for('deploy');
+}
+
+use_ok 'DBIx::Class::Admin';
 
+# lock early
+DBICTest->init_schema(no_deploy => 1, no_populate => 1);
+
+my $db_fn = DBICTest->_sqlite_dbfilename;
+my @connect_info = (
+  "dbi:SQLite:$db_fn",
+  undef,
+  undef,
+  { on_connect_do => 'PRAGMA synchronous = OFF' },
+);
+my $ddl_dir = dir(qw/t var/, "admin_ddl-$$");
 
 { # create the schema
 
-my $schema = DBICTest->init_schema(
-    no_deploy=>1,
-    no_populate=>1,
-	);
-	clean_dir($sql_dir);
+#  make sure we are  clean
+clean_dir($ddl_dir);
+
+
 my $admin = DBIx::Class::Admin->new(
-	schema_class=> "DBICTest::Schema",
-	sql_dir=> $sql_dir,
-	connect_info => $schema->storage->connect_info() 
+  schema_class=> "DBICTest::Schema",
+  sql_dir=> $ddl_dir,
+  connect_info => \@connect_info,
 );
-
+isa_ok ($admin, 'DBIx::Class::Admin', 'create the admin object');
 lives_ok { $admin->create('MySQL'); } 'Can create MySQL sql';
 lives_ok { $admin->create('SQLite'); } 'Can Create SQLite sql';
+lives_ok {
+  $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /no such table.+DROP TABLE/s };
+  $admin->deploy()
+} 'Can Deploy schema';
 }
 
-
 { # upgrade schema
 
-my $schema = DBICTest->init_schema(
-    no_deploy=>1,
-    no_populate=>1,
-	);
+clean_dir($ddl_dir);
+require DBICVersion_v1;
+
+my $admin = DBIx::Class::Admin->new(
+  schema_class => 'DBICVersion::Schema',
+  sql_dir =>  $ddl_dir,
+  connect_info => \@connect_info,
+);
+
+my $schema = $admin->schema();
 
-	clean_dir($sql_dir);
-use DBICVersionOrig;
+lives_ok { $admin->create($schema->storage->sqlt_type(), {add_drop_table=>0}); } 'Can create DBICVersionOrig sql in ' . $schema->storage->sqlt_type;
+lives_ok { $admin->deploy(  ) } 'Can Deploy schema';
+
+# connect to now deployed schema
+lives_ok { $schema = DBICVersion::Schema->connect(@{$schema->storage->connect_info()}); } 'Connect to deployed Database';
+
+is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema deployed and versions match');
+
+
+require DBICVersion_v2;
+DBICVersion::Schema->upgrade_directory (undef);  # so that we can test use of $ddl_dir
+
+$admin = DBIx::Class::Admin->new(
+  schema_class => 'DBICVersion::Schema',
+  sql_dir =>  $ddl_dir,
+  connect_info => \@connect_info
+);
+
+lives_ok { $admin->create($schema->storage->sqlt_type(), {}, "1.0" ); } 'Can create diff for ' . $schema->storage->sqlt_type;
+{
+  local $SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DB version .+? is lower than the schema version/ };
+  lives_ok {$admin->upgrade();} 'upgrade the schema';
+  dies_ok {$admin->deploy} 'cannot deploy installed schema, should upgrade instead';
+}
+
+is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema and db versions match');
+
+}
+
+{ # install
+
+clean_dir($ddl_dir);
 
 my $admin = DBIx::Class::Admin->new(
-	schema_class => 'DBICVersion::Schema', 
-	sql_dir =>  $sql_dir,
-	connect_info => $schema->storage->connect_info(),
+  schema_class  => 'DBICVersion::Schema',
+  sql_dir      => $ddl_dir,
+  _confirm    => 1,
+  connect_info  => \@connect_info,
 );
-lives_ok { $admin->create($schema->storage->sqlt_type()); } 'Can create DBICVersionOrig sql in ' . $schema->storage->sqlt_type;
-lives_ok { $admin->deploy(); } 'Can Deploy schema';
 
+$admin->version("3.0");
+lives_ok { $admin->install(); } 'install schema version 3.0';
+is($admin->schema->get_db_version, "3.0", 'db thinks its version 3.0');
+dies_ok { $admin->install("4.0"); } 'cannot install to allready existing version';
+
+$admin->force(1);
+warnings_exist ( sub {
+  lives_ok { $admin->install("4.0") } 'can force install to allready existing version'
+}, qr/Forcing install may not be a good idea/, 'Force warning emitted' );
+is($admin->schema->get_db_version, "4.0", 'db thinks its version 4.0');
 }
 
 sub clean_dir {
-	my ($dir)  =@_;
-	foreach my $file ($dir->children) {
-		unlink $file;
-	}
+  my ($dir) = @_;
+  $dir->rmtree if -d $dir;
+  unlink $db_fn;
+}
+
+END {
+  clean_dir($ddl_dir);
 }
 
 done_testing;