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

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-03-24 20:49:38 +0000 (Wed, 24 Mar 2010)
New Revision: 9052

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
Log:
s/_get_server_info/_populate_server_info/

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm	2010-03-24 20:25:24 UTC (rev 9051)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm	2010-03-24 20:49:38 UTC (rev 9052)
@@ -921,7 +921,7 @@
 
   $self->_run_connection_actions unless $self->{_in_determine_driver};
 
-  $self->_get_server_info;
+  $self->_populate_server_info;
 }
 
 sub _run_connection_actions {
@@ -934,12 +934,14 @@
   $self->_do_connection_actions(connect_call_ => $_) for @actions;
 }
 
-sub _get_server_info {
+sub _populate_server_info {
   my $self = shift;
   my %info;
 
-  $info{dbms_ver} = $self->_get_dbh->get_info(18);
+  my $dbms_ver = eval { local $@; $self->_get_dbh->get_info(18) };
 
+  $info{dbms_ver} = $dbms_ver if defined $dbms_ver;
+
   $self->_server_info(\%info);
 
   return \%info;