[Bast-commits] r3491 - in branches/DBIx-Class-current: lib/DBIx/Class/Storage/DBI t

[blblack at dev.catalyst.perl.org]

Author: blblack
Date: 2007-06-12 07:10:52 +0100 (Tue, 12 Jun 2007)
New Revision: 3491

Modified:
   branches/DBIx-Class-current/lib/DBIx/Class/Storage/DBI/Cursor.pm
   branches/DBIx-Class-current/t/92storage.t
Log:
add some storage exception tests, and fix a really obscure bug in DBIC::S::DBI::Cursor::DESTROY

Modified: branches/DBIx-Class-current/lib/DBIx/Class/Storage/DBI/Cursor.pm
===================================================================
--- branches/DBIx-Class-current/lib/DBIx/Class/Storage/DBI/Cursor.pm	2007-06-11 17:31:20 UTC (rev 3490)
+++ branches/DBIx-Class-current/lib/DBIx/Class/Storage/DBI/Cursor.pm	2007-06-12 06:10:52 UTC (rev 3491)
@@ -164,6 +164,7 @@
   my ($self) = @_;
 
   # None of the reasons this would die matter if we're in DESTROY anyways
+  local $@;
   eval { $self->{sth}->finish if $self->{sth} && $self->{sth}->{Active} };
 }
 

Modified: branches/DBIx-Class-current/t/92storage.t
===================================================================
--- branches/DBIx-Class-current/t/92storage.t	2007-06-11 17:31:20 UTC (rev 3490)
+++ branches/DBIx-Class-current/t/92storage.t	2007-06-12 06:10:52 UTC (rev 3491)
@@ -32,22 +32,31 @@
     }
 }
 
-plan tests => 3;
+plan tests => 5;
 
 my $schema = DBICTest->init_schema();
 
 is( ref($schema->storage), 'DBIx::Class::Storage::DBI::SQLite',
     'Storage reblessed correctly into DBIx::Class::Storage::DBI::SQLite' );
 
-
 my $storage = $schema->storage;
 $storage->ensure_connected;
 
+eval {
+    $schema->storage->throw_exception('test_exception_42');
+};
+like($@, qr/\btest_exception_42\b/, 'basic exception');
+
+eval {
+    $schema->resultset('CD')->search_literal('broken +%$#$1')->all;
+};
+like($@, qr/prepare_cached failed/, 'exception via DBI->HandleError, etc');
+
 bless $storage, "DBICTest::ExplodingStorage";
 $schema->storage($storage);
 
 eval { 
-    $schema->resultset('Artist')->create({ name => "Exploding Sheep" }) 
+    $schema->resultset('Artist')->create({ name => "Exploding Sheep" });
 };
 
 is($@, "", "Exploding \$sth->execute was caught");