[Bast-commits] r9316 - DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2010-05-07 09:15:48 +0100 (Fri, 07 May 2010)
New Revision: 9316

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
Log:
Failure to determine dbms version is *not* a fatal error - trap exceptions

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm	2010-05-07 02:27:18 UTC (rev 9315)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm	2010-05-07 08:15:48 UTC (rev 9316)
@@ -1012,7 +1012,10 @@
 
     my %info;
 
-    my $server_version = $self->_get_server_version;
+    my $server_version = do {
+      local $@; # might be happenin in some sort of destructor
+      eval { $self->_get_server_version };
+    };
 
     if (defined $server_version) {
       $info{dbms_version} = $server_version;
@@ -1044,7 +1047,7 @@
 }
 
 sub _get_server_version {
-  eval { shift->_get_dbh->get_info(18) };
+  shift->_get_dbh->get_info(18);
 }
 
 sub _determine_driver {