X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fadmin%2F02ddl.t;h=460ff30243f59169dc9f40f3a02d0f65befcf7f6;hb=99ab62de187b2a263fb698c26deb060f4ec05c8d;hp=3aaf60c05c5e0ac2a6907fed39e91c16ad6ac67b;hpb=6bceaca3027dcc297955cf373f5ea62b8634afc3;p=dbsrgits%2FDBIx-Class.git diff --git a/t/admin/02ddl.t b/t/admin/02ddl.t index 3aaf60c..460ff30 100644 --- a/t/admin/02ddl.t +++ b/t/admin/02ddl.t @@ -1,83 +1,69 @@ -# -#=============================================================================== -# -# FILE: 02admin..t -# -# DESCRIPTION: -# -# FILES: --- -# BUGS: --- -# NOTES: --- -# AUTHOR: Gordon Irving (), -# 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; BEGIN { - eval "use DBIx::Class::Admin"; - plan skip_all => "Deps not installed: $@" if $@; -} + 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'); -use Path::Class; -use FindBin qw($Bin); -use Module::Load; + plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('deploy') + unless DBIx::Class::Optional::Dependencies->req_ok_for('deploy'); +} -use lib dir($Bin,'..', '..','lib')->stringify; -use lib dir($Bin,'..', 'lib')->stringify; +use lib qw(t/lib); +use DBICTest; -use ok 'DBIx::Class::Admin'; +use Path::Class; -use DBICTest; +use_ok 'DBIx::Class::Admin'; -my $sql_dir = dir($Bin,"..","var"); +my $sql_dir = dir(qw/t var/); +my @connect_info = DBICTest->_database( + no_deploy=>1, + no_populate=>1, + sqlite_use_file => 1, +); { # 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, - ); - 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=> $sql_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 { $admin->deploy() } 'Can Deploy schema'; } { # upgrade schema -my $schema = DBICTest->init_schema( - no_deploy => 1, - no_populat => 1, - sqlite_use_file => 1, -); +#my $schema = DBICTest->init_schema( +# no_deploy => 1, +# no_populat => 1, +# sqlite_use_file => 1, +#); clean_dir($sql_dir); -load 'DBICVersionOrig'; +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 => $sql_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'; @@ -87,19 +73,20 @@ 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; $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 => $sql_dir, + connect_info => \@connect_info ); lives_ok { $admin->create($schema->storage->sqlt_type(), {}, "1.0" ); } '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'; +{ + 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'); @@ -109,41 +96,37 @@ is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema and db versio clean_dir($sql_dir); -my $schema = DBICTest->init_schema( - no_deploy=>1, - no_populate=>1, - sqlite_use_file => 1, - ); - 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 => $sql_dir, + _confirm => 1, + connect_info => \@connect_info, ); $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'; -sleep 1; + $admin->force(1); -lives_ok { $admin->install("4.0"); } 'can force install to allready existing version'; +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'); #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; - } + my ($dir) = @_; + $dir = $dir->resolve; + if ( ! -d $dir ) { + $dir->mkpath(); + } + foreach my $file ($dir->children) { + # skip any hidden files + next if ($file =~ /^\./); + unlink $file; + } } done_testing;