X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Frun%2F16joins.tl;h=80444e726c067803de80eed3e892cd8b6a4dbc2d;hb=0e35aa052e46ab92234f2b7614e8afd92ae60bdf;hp=962ee48f239a00155f5219cddfe4e0d2e0509759;hpb=485f6e107dda47fa75315f180f7a7e2345a2cbfc;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/run/16joins.tl b/t/run/16joins.tl
index 962ee48..80444e7 100644
--- a/t/run/16joins.tl
+++ b/t/run/16joins.tl
@@ -2,7 +2,6 @@ sub run_tests {
 my $schema = shift;
 
 use IO::File;
-use version;
 
 BEGIN {
     eval "use DBD::SQLite";
@@ -11,8 +10,17 @@ BEGIN {
         : ( tests => 41 );
 }
 
-my $is_broken_sqlite = version->new($schema->storage->dbh->get_info(18)) lt '3.2.6' &&
-                       $schema->storage->dbh->get_info(17) eq 'SQLite';
+# figure out if we've got a version of sqlite that is older than 3.2.6, in
+# which case COUNT(DISTINCT()) doesn't work
+my $is_broken_sqlite = 0;
+my ($sqlite_major_ver,$sqlite_minor_ver,$sqlite_patch_ver) =
+    split /\./, $schema->storage->dbh->get_info(18);
+if( $schema->storage->dbh->get_info(17) eq 'SQLite' &&
+    ( ($sqlite_major_ver < 3) ||
+      ($sqlite_major_ver == 3 && $sqlite_minor_ver < 2) ||
+      ($sqlite_major_ver == 3 && $sqlite_minor_ver == 2 && $sqlite_patch_ver < 6) ) ) {
+    $is_broken_sqlite = 1;
+}
 
 # test the abstract join => SQL generator
 my $sa = new DBIC::SQL::Abstract;
@@ -140,7 +148,7 @@ is($selects, 1, 'prefetch ran only 1 select statement');
 my $cd = $schema->resultset('CD')->find(1,
     {
       cols => [qw/title artist.name/], 
-      join => 'artist'
+      join => { 'artist' => {} }
     }
 );
 ok(eval { $cd->artist->name eq 'Caterwauler McCrae' }, 'single related column prefetched');