X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FDBICTest.pm;h=953b2494200057f5cb42c2d02ef2a65cd7c5b16a;hb=39c9c72df61c84b595715e3d164bacc0b8e68439;hp=e4b9b768af0c7bdcc88e8ee18c6a36775cd23960;hpb=cda5e0825360a15f97520dae86864b68ac90d5f5;p=dbsrgits%2FDBIx-Class.git diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm old mode 100755 new mode 100644 index e4b9b76..953b249 --- a/t/lib/DBICTest.pm +++ b/t/lib/DBICTest.pm @@ -3,7 +3,9 @@ package # hide from PAUSE use strict; use warnings; +use DBICTest::RunMode; use DBICTest::Schema; +use Carp; =head1 NAME @@ -31,7 +33,7 @@ DBIx::Class. no_populate=>1, storage_type=>'::DBI::Replicated', storage_type_args=>{ - balancer_type=>'DBIx::Class::Storage::DBI::Replicated::Balancer::Random' + balancer_type=>'DBIx::Class::Storage::DBI::Replicated::Balancer::Random' }, ); @@ -47,7 +49,7 @@ default, unless the no_deploy or no_populate flags are set. =cut sub has_custom_dsn { - return $ENV{"DBICTEST_DSN"} ? 1:0; + return $ENV{"DBICTEST_DSN"} ? 1:0; } sub _sqlite_dbfilename { @@ -58,25 +60,122 @@ sub _sqlite_dbname { my $self = shift; my %args = @_; return $self->_sqlite_dbfilename if $args{sqlite_use_file} or $ENV{"DBICTEST_SQLITE_USE_FILE"}; - return ":memory:"; + return ":memory:"; } sub _database { my $self = shift; my %args = @_; + + if ($ENV{DBICTEST_DSN}) { + return ( + (map { $ENV{"DBICTEST_${_}"} || '' } qw/DSN DBUSER DBPASS/), + { AutoCommit => 1, %args }, + ); + } my $db_file = $self->_sqlite_dbname(%args); - unlink($db_file) if -e $db_file; - unlink($db_file . "-journal") if -e $db_file . "-journal"; + for ($db_file, "${db_file}-journal") { + next unless -e $_; + unlink ($_) or carp ( + "Unable to unlink existing test database file $_ ($!), creation of fresh database / further tests may fail!\n" + ); + } + mkdir("t/var") unless -d "t/var"; - my $dsn = $ENV{"DBICTEST_DSN"} || "dbi:SQLite:${db_file}"; - my $dbuser = $ENV{"DBICTEST_DBUSER"} || ''; - my $dbpass = $ENV{"DBICTEST_DBPASS"} || ''; + return ("dbi:SQLite:${db_file}", '', '', { + AutoCommit => 1, + + # this is executed on every connect, and thus installs a disconnect/DESTROY + # guard for every new $dbh + on_connect_do => sub { + my $storage = shift; + my $dbh = $storage->_get_dbh; + + # no fsync on commit + $dbh->do ('PRAGMA synchronous = OFF'); + + # set a *DBI* disconnect callback, to make sure the physical SQLite + # file is still there (i.e. the test does not attempt to delete + # an open database, which fails on Win32) + if (my $guard_cb = __mk_disconnect_guard($db_file)) { + $dbh->{Callbacks} = { + connect => sub { $guard_cb->('connect') }, + disconnect => sub { $guard_cb->('disconnect') }, + DESTROY => sub { $guard_cb->('DESTROY') }, + }; + } + }, + %args, + }); +} + +sub __mk_disconnect_guard { + my $db_file = shift; + return unless -f $db_file; + + my $orig_inode = (stat($db_file))[1] + or return; + + my $clan_connect_caller = '*UNKNOWN*'; + my $i; + while ( my ($pack, $file, $line) = caller(++$i) ) { + next if $file eq __FILE__; + next if $pack =~ /^DBIx::Class|^Try::Tiny/; + $clan_connect_caller = "$file line $line"; + } + + my $failed_once = 0; + my $connected = 1; + + return sub { + return if $failed_once; + + my $event = shift; + if ($event eq 'connect') { + # this is necessary in case we are disconnected and connected again, all within the same $dbh object + $connected = 1; + return; + } + elsif ($event eq 'disconnect') { + $connected = 0; + } + elsif ($event eq 'DESTROY' and ! $connected ) { + return; + } + + my $fail_reason; + if (! -e $db_file) { + $fail_reason = 'is missing'; + } + else { + my $cur_inode = (stat($db_file))[1]; + + if ($orig_inode != $cur_inode) { + # pack/unpack to match the unsigned longs returned by `stat` + $fail_reason = sprintf 'was recreated (initially inode %s, now %s)', ( + map { unpack ('L', pack ('l', $_) ) } ($orig_inode, $cur_inode ) + ); + } + } - my @connect_info = ($dsn, $dbuser, $dbpass, { AutoCommit => 1 }); + if ($fail_reason) { + $failed_once++; + + require Test::Builder; + my $t = Test::Builder->new; + local $Test::Builder::Level = $Test::Builder::Level + 3; + $t->ok (0, + "$db_file originally created at $clan_connect_caller $fail_reason before $event " + . 'of DBI handle - a strong indicator that the database file was tampered with while ' + . 'still being open. This action would fail massively if running under Win32, hence ' + . 'we make sure it fails on any OS :)' + ); + } - return @connect_info; + return; # this empty return is a DBI requirement + }; } sub init_schema { @@ -84,7 +183,7 @@ sub init_schema { my %args = @_; my $schema; - + if ($args{compose_connection}) { $schema = DBICTest::Schema->compose_connection( 'DBICTest', $self->_database(%args) @@ -92,14 +191,15 @@ sub init_schema { } else { $schema = DBICTest::Schema->compose_namespace('DBICTest'); } + if( $args{storage_type}) { - $schema->storage_type($args{storage_type}); - } + $schema->storage_type($args{storage_type}); + } + if ( !$args{no_connect} ) { $schema = $schema->connect($self->_database(%args)); - $schema->storage->on_connect_do(['PRAGMA synchronous = OFF']) - unless $self->has_custom_dsn; } + if ( !$args{no_deploy} ) { __PACKAGE__->deploy_schema( $schema, $args{deploy_args} ); __PACKAGE__->populate_schema( $schema ) @@ -126,7 +226,7 @@ sub deploy_schema { my $args = shift || {}; if ($ENV{"DBICTEST_SQLT_DEPLOY"}) { - $schema->deploy($args); + $schema->deploy($args); } else { open IN, "t/lib/sqlite.sql"; my $sql; @@ -134,7 +234,7 @@ sub deploy_schema { close IN; for my $chunk ( split (/;\s*\n+/, $sql) ) { if ( $chunk =~ / ^ (?! --\s* ) \S /xm ) { # there is some real sql in the chunk - a non-space at the start of the string which is not a comment - $schema->storage->dbh->do($chunk) or print "Error on SQL: $chunk\n"; + $schema->storage->dbh_do(sub { $_[1]->do($chunk) }) or print "Error on SQL: $chunk\n"; } } } @@ -154,6 +254,11 @@ sub populate_schema { my $self = shift; my $schema = shift; + $schema->populate('Genre', [ + [qw/genreid name/], + [qw/1 emo /], + ]); + $schema->populate('Artist', [ [ qw/artistid name/ ], [ 1, 'Caterwauler McCrae' ], @@ -162,8 +267,8 @@ sub populate_schema { ]); $schema->populate('CD', [ - [ qw/cdid artist title year/ ], - [ 1, 1, "Spoonful of bees", 1999 ], + [ qw/cdid artist title year genreid/ ], + [ 1, 1, "Spoonful of bees", 1999, 1 ], [ 2, 1, "Forkful of bees", 2001 ], [ 3, 1, "Caterwaulin' Blues", 1997 ], [ 4, 2, "Generic Manufactured Singles", 2001 ], @@ -242,7 +347,7 @@ sub populate_schema { $schema->populate('TreeLike', [ [ qw/id parent name/ ], - [ 1, undef, 'root' ], + [ 1, undef, 'root' ], [ 2, 1, 'foo' ], [ 3, 2, 'bar' ], [ 6, 2, 'blop' ], @@ -309,7 +414,7 @@ sub populate_schema { ]); $schema->populate('Owners', [ - [ qw/ownerid name/ ], + [ qw/id name/ ], [ 1, "Newton" ], [ 2, "Waltham" ], ]);