From: Rafael Kitover <rkitover@cpan.org>
Date: Fri, 26 Mar 2010 08:55:46 +0000 (+0000)
Subject: a couple minor Informix fixes
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=88704779cb6018a9680c15f8c1bc1e1285985595;p=dbsrgits%2FDBIx-Class-Historic.git

a couple minor Informix fixes
---

diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index b669aa0..4a94e2c 100644
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -943,6 +943,8 @@ sub _populate_server_info {
   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;
   }
diff --git a/t/748informix.t b/t/748informix.t
index 04582fe..a1d533a 100644
--- a/t/748informix.t
+++ b/t/748informix.t
@@ -11,7 +11,7 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_INFORMIX_${_}" } qw/DSN USER PASS
 #warn "$dsn $user $pass";
 
 plan skip_all => 'Set $ENV{DBICTEST_INFORMIX_DSN}, _USER and _PASS to run this test'
-  unless ($dsn && $user);
+  unless $dsn;
 
 my $schema = DBICTest::Schema->connect($dsn, $user, $pass);