X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F76joins.t;h=c6e795c42c4ef2af916fa73eabd9b5b1a96de564;hb=840736b037623f76a6b6086019b5cd197d394651;hp=23336b85a59db20d839073e04836a86c1728b1c6;hpb=6f4ddea126a20d67bc599a804d097ed8d3c086aa;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/t/76joins.t b/t/76joins.t index 23336b8..c6e795c 100644 --- a/t/76joins.t +++ b/t/76joins.t @@ -20,18 +20,6 @@ BEGIN { : ( tests => 33 ); } -# 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 DBIx::Class::SQLAHacks; @@ -127,7 +115,7 @@ my @j6 = ( [ { father => 'person' }, { 'father.person_id' => { '!=', '42' } }, ], [ { mother => 'person' }, { 'mother.person_id' => 'child.mother_id' } ], ); -$match = qr/^HASH reference arguments are not supported in JOINS - try using "\.\.\." instead/; +$match = qr/HASH reference arguments are not supported in JOINS/; eval { $sa->_recurse_from(@j6) }; like( $@, $match, 'join 6 (HASH reference for ON statement dies) ok' );