From: Peter Rabbitson Date: Tue, 7 Oct 2008 10:25:36 +0000 (+0000) Subject: Schema::Versioned test cleanups: X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1475105d6d87809c5feb4b4ce417cf24831bc192;p=dbsrgits%2FDBIx-Class-Historic.git Schema::Versioned test cleanups: - Add a test exposing a lapse in design resulting in intermittent test failures - Add a number of tests to trap expected warnings - Cleanup the temp dir after the test, set DBICTEST_KEEP_VERSIONING_DDL to override --- diff --git a/t/94versioning.t b/t/94versioning.t index 633100e..4899530 100644 --- a/t/94versioning.t +++ b/t/94versioning.t @@ -4,6 +4,7 @@ use warnings; use Test::More; use File::Spec; use File::Copy; +use Time::HiRes qw/time sleep/; #warn "$dsn $user $pass"; my ($dsn, $user, $pass); @@ -18,12 +19,19 @@ BEGIN { eval "use DBD::mysql; use SQL::Translator 0.09;"; plan $@ ? ( skip_all => 'needs DBD::mysql and SQL::Translator 0.09 for testing' ) - : ( tests => 17 ); + : ( tests => 23 ); } my $version_table_name = 'dbix_class_schema_versions'; my $old_table_name = 'SchemaVersions'; +my $ddl_dir = File::Spec->catdir ('t', 'var'); +my $fn = { + v1 => File::Spec->catfile($ddl_dir, 'DBICVersion-Schema-1.0-MySQL.sql'), + v2 => File::Spec->catfile($ddl_dir, 'DBICVersion-Schema-2.0-MySQL.sql'), + trans => File::Spec->catfile($ddl_dir, 'DBICVersion-Schema-1.0-2.0-MySQL.sql'), +}; + use lib qw(t/lib); use_ok('DBICVersionOrig'); @@ -31,27 +39,37 @@ my $schema_orig = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_vers eval { $schema_orig->storage->dbh->do('drop table ' . $version_table_name) }; eval { $schema_orig->storage->dbh->do('drop table ' . $old_table_name) }; -is($schema_orig->ddl_filename('MySQL', '1.0', 't/var'), File::Spec->catfile('t', 'var', 'DBICVersion-Schema-1.0-MySQL.sql'), 'Filename creation working'); -unlink('t/var/DBICVersion-Schema-1.0-MySQL.sql') if (-e 't/var/DBICVersion-Schema-1.0-MySQL.sql'); -$schema_orig->create_ddl_dir('MySQL', undef, 't/var'); +is($schema_orig->ddl_filename('MySQL', '1.0', $ddl_dir), $fn->{v1}, 'Filename creation working'); +unlink( $fn->{v1} ) if ( -e $fn->{v1} ); +$schema_orig->create_ddl_dir('MySQL', undef, $ddl_dir); -ok(-f 't/var/DBICVersion-Schema-1.0-MySQL.sql', 'Created DDL file'); +ok(-f $fn->{v1}, 'Created DDL file'); $schema_orig->deploy({ add_drop_table => 1 }); my $tvrs = $schema_orig->{vschema}->resultset('Table'); is($schema_orig->_source_exists($tvrs), 1, 'Created schema from DDL file'); +# loading a new module defining a new version of the same table +DBICVersion::Schema->_unregister_source ('Table'); eval "use DBICVersionNew"; + +my $schema_upgrade = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_version => 1 }); { - unlink('t/var/DBICVersion-Schema-2.0-MySQL.sql'); - unlink('t/var/DBICVersion-Schema-1.0-2.0-MySQL.sql'); + unlink($fn->{v2}); + unlink($fn->{trans}); - my $schema_upgrade = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_version => 1 }); is($schema_upgrade->get_db_version(), '1.0', 'get_db_version ok'); is($schema_upgrade->schema_version, '2.0', 'schema version ok'); - $schema_upgrade->create_ddl_dir('MySQL', '2.0', 't/var', '1.0'); - ok(-f 't/var/DBICVersion-Schema-1.0-2.0-MySQL.sql', 'Created DDL file'); - $schema_upgrade->upgrade(); + $schema_upgrade->create_ddl_dir('MySQL', '2.0', $ddl_dir, '1.0'); + ok(-f $fn->{trans}, 'Created DDL file'); + + { + my $w; + local $SIG{__WARN__} = sub { $w = shift }; + $schema_upgrade->upgrade(); + like ($w, qr/Attempting upgrade\.$/, 'Warn before upgrade'); + } + is($schema_upgrade->get_db_version(), '2.0', 'db version number upgraded'); eval { @@ -59,8 +77,14 @@ eval "use DBICVersionNew"; }; is($@, '', 'new column created'); - # should overwrite files - $schema_upgrade->create_ddl_dir('MySQL', '2.0', 't/var', '1.0'); + # should overwrite files and warn about it + my @w; + local $SIG{__WARN__} = sub { push @w, shift }; + $schema_upgrade->create_ddl_dir('MySQL', '2.0', $ddl_dir, '1.0'); + + is (2, @w, 'A warning generated for both the DDL and the diff'); + like ($w[0], qr/^Overwriting existing DDL file - $fn->{v2}/, 'New version DDL overwrite warning'); + like ($w[1], qr/^Overwriting existing diff file - $fn->{trans}/, 'Upgrade diff overwrite warning'); } { @@ -106,7 +130,7 @@ eval "use DBICVersionNew"; is($warn, '', 'warning not detected with attr set'); # should not warn - $ENV{DBIC_NO_VERSION_CHECK} = 1; + local $ENV{DBIC_NO_VERSION_CHECK} = 1; $warn = ''; $schema_version = DBICVersion::Schema->connect($dsn, $user, $pass); is($warn, '', 'warning not detected with env var set'); @@ -117,3 +141,32 @@ eval "use DBICVersionNew"; like($warn, qr/Your DB is currently unversioned/, 'warning detected without env var or attr'); # should warn } + +# attempt a deploy/upgrade cycle within one second +{ + eval { $schema_orig->storage->dbh->do('drop table ' . $version_table_name) }; + eval { $schema_orig->storage->dbh->do('drop table ' . $old_table_name) }; + eval { $schema_orig->storage->dbh->do('drop table TestVersion') }; + + # this attempts to sleep until the turn of the second + my $t = time(); + sleep (int ($t) + 1 - $t); + diag ('Fast deploy/upgrade start: ', time() ); + + { + local $DBICVersion::Schema::VERSION = '1.0'; + $schema_orig->deploy; + } +sleep 1; + + my $w; + local $SIG{__WARN__} = sub { $w = shift }; + $schema_upgrade->upgrade(); + like ($w, qr/Attempting upgrade\.$/, 'Warn before upgrade'); + + is($schema_upgrade->get_db_version(), '2.0', 'Fast deploy/upgrade'); +} + +unless ($ENV{DBICTEST_KEEP_VERSIONING_DDL}) { + unlink $_ for (values %$fn); +}