X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F94versioning.t;h=d62f117d3186a8da8cb63b3b1f918a723eba56df;hb=d68d84f81423572b0551f1ed14b1c6da627fbaea;hp=4ef0864f644c88a70a7547b6cfbeefccf3d7e32b;hpb=864560318434c00fac042da089bb2764a68565cf;p=dbsrgits%2FDBIx-Class.git diff --git a/t/94versioning.t b/t/94versioning.t index 4ef0864..d62f117 100644 --- a/t/94versioning.t +++ b/t/94versioning.t @@ -16,9 +16,9 @@ BEGIN { unless ($dsn); - eval "use DBD::mysql; use SQL::Translator 0.09;"; + eval "use DBD::mysql; use SQL::Translator 0.09003;"; plan $@ - ? ( skip_all => 'needs DBD::mysql and SQL::Translator 0.09 for testing' ) + ? ( skip_all => 'needs DBD::mysql and SQL::Translator 0.09003 for testing' ) : ( tests => 22 ); } @@ -33,6 +33,8 @@ my $fn = { }; use lib qw(t/lib); +use DBICTest; # do not remove even though it is not used + use_ok('DBICVersionOrig'); my $schema_orig = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_version => 1 }); @@ -83,7 +85,7 @@ my $schema_upgrade = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_v # should overwrite files and warn about it my @w; local $SIG{__WARN__} = sub { - if ($_[0] =~ /^Overwriting/) { + if ($_[0] =~ /Overwriting existing/) { push @w, $_[0]; } else { @@ -93,8 +95,8 @@ my $schema_upgrade = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_v $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'); + 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'); } {