From: Rafael Kitover <rkitover@cpan.org>
Date: Wed, 24 Mar 2010 20:49:38 +0000 (+0000)
Subject: s/_get_server_info/_populate_server_info/
X-Git-Tag: v0.08121~34
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=607b79a3e0bcb910e1d8634570c742f7b3438e78;p=dbsrgits%2FDBIx-Class.git

s/_get_server_info/_populate_server_info/
---

diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index 736bcc9..1463df4 100644
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -921,7 +921,7 @@ sub _populate_dbh {
 
   $self->_run_connection_actions unless $self->{_in_determine_driver};
 
-  $self->_get_server_info;
+  $self->_populate_server_info;
 }
 
 sub _run_connection_actions {
@@ -934,11 +934,13 @@ sub _run_connection_actions {
   $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);