X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fadmin%2F02ddl.t;h=bb354ac423c9834fa9c404d173ce1835c88c137c;hb=86a432d4cc096062e2374f118ce38aa131799d6a;hp=de1f067455be6e356ae538eb9210fe66296208d6;hpb=6daebebcb2de423295dc746b5ec9fc656e56f746;p=dbsrgits%2FDBIx-Class.git diff --git a/t/admin/02ddl.t b/t/admin/02ddl.t index de1f067..bb354ac 100644 --- a/t/admin/02ddl.t +++ b/t/admin/02ddl.t @@ -1,79 +1,64 @@ -# -#=============================================================================== -# -# FILE: 02admin..t -# -# DESCRIPTION: -# -# FILES: --- -# BUGS: --- -# NOTES: --- -# AUTHOR: Gordon Irving (), -# COMPANY: Sophos -# VERSION: 1.0 -# CREATED: 28/11/09 16:14:21 GMT -# REVISION: --- -#=============================================================================== +BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) } +use DBIx::Class::Optional::Dependencies -skip_all_without => qw( admin deploy ); 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 Module::Load; - -use lib dir($Bin,'..', '..','lib')->stringify; -use lib dir($Bin,'..', 'lib')->stringify; +use DBICTest; +use DBIx::Class::_Util 'sigwarn_silencer'; +use DBICTest::Util 'rm_rf'; -use ok 'DBIx::Class::Admin'; +use DBIx::Class::Admin; -use DBICTest; +# lock early +DBICTest->init_schema(no_deploy => 1, no_populate => 1); -my $sql_dir = dir($Bin,"..","var"); +my $db_fn = DBICTest->_sqlite_dbfilename; +my @connect_info = ( + "dbi:SQLite:$db_fn", + undef, + undef, + { on_connect_do => 'PRAGMA synchronous = OFF' }, +); +my $ddl_dir = "t/var/admin_ddl-$$"; { # create the schema # make sure we are clean -clean_dir($sql_dir); - -# create a DBICTest so we can steal its connect info -my $schema = DBICTest->init_schema( - no_deploy=>1, - no_populate=>1, - ); +cleanup(); 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 { + local $SIG{__WARN__} = sigwarn_silencer( qr/no such table.+DROP TABLE/s ); + $admin->deploy() +} 'Can Deploy schema'; } { # upgrade schema -my $schema = DBICTest->init_schema( - no_deploy => 1, - no_populat => 1, - sqlite_use_file => 1, -); - -clean_dir($sql_dir); -load 'DBICVersionOrig'; +cleanup(); +require DBICVersion_v1; 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, + connect_info => \@connect_info, ); + +my $schema = $admin->schema(); + 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'; @@ -83,20 +68,21 @@ lives_ok { $schema = DBICVersion::Schema->connect(@{$schema->storage->connect_in is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema deployed and versions match'); -load 'DBICVersionNew'; +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 => "t/var", - connect_info => $schema->storage->connect_info(), + schema_class => 'DBICVersion::Schema', + sql_dir => $ddl_dir, + connect_info => \@connect_info ); -$admin->preversion("1.0"); -lives_ok { $admin->create($schema->storage->sqlt_type(), ); } 'Can create diff for ' . $schema->storage->sqlt_type; -# sleep required for upgrade table to hold a distinct time of upgrade value -# otherwise the returned of get_db_version can be undeterministic -sleep 1; -lives_ok {$admin->upgrade();} 'upgrade the schema'; +lives_ok { $admin->create($schema->storage->sqlt_type(), {}, "1.0" ); } 'Can create diff for ' . $schema->storage->sqlt_type; +{ + local $SIG{__WARN__} = sigwarn_silencer( qr/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'); @@ -104,43 +90,36 @@ is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema and db versio { # install -clean_dir($sql_dir); - -my $schema = DBICTest->init_schema( - no_deploy=>1, - no_populate=>1, - sqlite_use_file => 1, - ); +cleanup(); my $admin = DBIx::Class::Admin->new( - schema_class => 'DBICVersion::Schema', - sql_dir => $sql_dir, - connect_info => $schema->storage->connect_info(), - _confirm => 1, + schema_class => 'DBICVersion::Schema', + sql_dir => $ddl_dir, + _confirm => 1, + connect_info => \@connect_info, ); $admin->version("3.0"); -lives_ok { $admin->install(); } 'install schema version 3.0'; +$admin->install; 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'; -sleep 1; +throws_ok { + $admin->install("4.0") +} qr/Schema already has a version. Try upgrade instead/, 'cannot install to allready existing version'; + $admin->force(1); -lives_ok { $admin->install("4.0"); } 'can force install to allready existing version'; +warnings_exist ( sub { + $admin->install("4.0") +}, 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'); -#clean_dir($sql_dir); } -sub clean_dir { - my ($dir) =@_; - $dir = $dir->resolve; - if ( ! -d $dir ) { - $dir->mkpath(); - } - foreach my $file ($dir->children) { - # skip any hidden files - next if ($file =~ /^\./); - unlink $file; - } +sub cleanup { + rm_rf $ddl_dir if -d $ddl_dir; + unlink $db_fn; +} + +END { + cleanup(); } done_testing;