final changes for 08004 dist

diff --git a/Changes b/Changes
index 9fac8d0..787c0d6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for DBIx::Class
 
+0.08004 2007-08-06 19:00:00
+        - fix storage connect code to not trigger bug via auto-viv 
+          (test from aherzog)
         - fixup cursor_class to be an 'inherited' attr for per-package defaults
         - add default_resultset_attributes entry to Schema
         - optimisation in DBI::Cursor to check software_limit before falling

diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 3f267ea..2a33c10 100644 (file)
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -23,7 +23,7 @@ sub component_base_class { 'DBIx::Class' }
 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
 # brain damage and presumably various other packaging systems too
 
-$VERSION = '0.08003';
+$VERSION = '0.08004';
 
 sub MODIFY_CODE_ATTRIBUTES {
   my ($class,$code,@attrs) = @_;

diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index c7c0d5b..996f9e0 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -773,7 +773,7 @@ sub _connect {
        $dbh = DBI->connect(@info);
     }
 
-    if(!$self->unsafe) {
+    if($dbh && !$self->unsafe) {
       my $weak_self = $self;
       weaken($weak_self);
       $dbh->{HandleError} = sub {

diff --git a/t/33storage_reconnect.t b/t/33storage_reconnect.t
index 6e82b13..f069ef0 100644 (file)
--- a/t/33storage_reconnect.t
+++ b/t/33storage_reconnect.t
@@ -1,11 +1,16 @@
 use strict;
 use warnings;  
 
+use FindBin;
+use File::Copy;
 use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-plan tests => 2;
+plan tests => 5;
+
+my $db_orig = "$FindBin::Bin/var/DBIxClass.db";
+my $db_tmp  = "$db_orig.tmp";
 
 # Set up the "usual" sqlite for DBICTest
 my $schema = DBICTest->init_schema;
@@ -24,3 +29,31 @@ $schema->storage->_dbh->disconnect;
 #   4. Success!
 my @art_two = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'});
 cmp_ok(@art_two, '==', 3, "Three artists returned");
+
+### Now, disconnect the dbh, and move the db file;
+# create a new one and chmod 000 to prevent SQLite from connecting.
+$schema->storage->_dbh->disconnect;
+move( $db_orig, $db_tmp );
+open DBFILE, '>', $db_orig;
+print DBFILE 'THIS IS NOT A REAL DATABASE';
+close DBFILE;
+chmod 0000, $db_orig;
+
+### Try the operation again... it should fail, since there's no db
+eval {
+    my @art_three = $schema->resultset("Artist")->search( {}, { order_by => 'name DESC' } );
+};
+ok( $@, 'The operation failed' );
+
+### Now, move the db file back to the correct name
+unlink($db_orig);
+move( $db_tmp, $db_orig );
+
+### Try the operation again... this time, it should succeed
+my @art_four;
+eval {
+    @art_four = $schema->resultset("Artist")->search( {}, { order_by => 'name DESC' } );
+};
+ok( !$@, 'The operation succedded' );
+cmp_ok( @art_four, '==', 3, "Three artists returned" );
+