minor cleanups

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI.pm

diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index b669aa0..aa154cf 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -938,11 +938,17 @@ sub _populate_server_info {
   my $self = shift;
   my %info;
 
-  my $dbms_ver = eval { local $@; $self->_get_dbh->get_info(18) };
+  my $dbms_ver = eval {
+      local $@;
+      $SIG{__WARN__} = sub {};
+      $self->_get_dbh->get_info(18)
+  };
 
   if (defined $dbms_ver) {
     $info{dbms_ver} = $dbms_ver;
 
+    ($dbms_ver) = $dbms_ver =~ /^(\S+)/;
+
     my @verparts = split /\./, $dbms_ver;
     $info{dbms_ver_normalized} = sprintf "%d.%03d%03d", @verparts;
   }