X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F71mysql.t;h=3bbdaa1a113e188767fa1700854266b4b6be3d89;hb=6c0ddbf737fa59fd988b0ca3bdbd0e68d2ef9e6d;hp=5fb027e5a8ec69152c12e8b23091186bd257bced;hpb=5db49b9aee9a586a76b37fd950bb9bc22bd5e985;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/71mysql.t b/t/71mysql.t
index 5fb027e..3bbdaa1 100644
--- a/t/71mysql.t
+++ b/t/71mysql.t
@@ -15,7 +15,7 @@ plan skip_all => 'Set $ENV{DBICTEST_MYSQL_DSN}, _USER and _PASS to run this test
 
 plan tests => 5;
 
-DBICTest::Schema->compose_connection('MySQLTest' => $dsn, $user, $pass);
+DBICTest::Schema->compose_namespace('MySQLTest' => $dsn, $user, $pass);
 
 my $dbh = MySQLTest->schema->storage->dbh;
 
@@ -69,10 +69,13 @@ my $test_type_info = {
 
 SKIP: {
     my $mysql_version = $dbh->get_info( $GetInfoType{SQL_DBMS_VER} );
-
     skip "Cannot determine MySQL server version", 1 if !$mysql_version;
 
-    my ($v1, $v2, $v3) = split(/\./, $mysql_version);
+    my ($v1, $v2, $v3) = $mysql_version =~ /^(\d+)\.(\d+)(?:\.(\d+))?/;
+    skip "Cannot determine MySQL server version", 1 if !$v1 || !defined($v2);
+
+    $v3 ||= 0;
+
     if( ($v1 < 5) || ($v1 == 5 && $v2 == 0 && $v3 <= 3) ) {
         $test_type_info->{charfield}->{data_type} = 'VARCHAR';
     }