From: Peter Rabbitson Date: Sat, 16 May 2009 06:02:18 +0000 (+0000) Subject: Cleanup tests X-Git-Tag: v0.08103~79 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1cc3ce1eef3deb794a2b2dd4cff166b91145e7c4;p=dbsrgits%2FDBIx-Class.git Cleanup tests --- diff --git a/t/60core.t b/t/60core.t index de290de..187164d 100644 --- a/t/60core.t +++ b/t/60core.t @@ -13,19 +13,6 @@ plan tests => 96; eval { require DateTime::Format::MySQL }; my $NO_DTFM = $@ ? 1 : 0; -# 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; -} - - my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'}); is(@art, 3, "Three artists returned"); @@ -240,10 +227,7 @@ is($or_rs->count, 5, 'Search with OR ok'); my $distinct_rs = $schema->resultset("CD")->search($search, { join => 'tags', distinct => 1 }); is($distinct_rs->all, 4, 'DISTINCT search with OR ok'); -SKIP: { - skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 2 - if $is_broken_sqlite; - +{ my $tcount = $schema->resultset('Track')->search( {}, { diff --git a/t/76joins.t b/t/76joins.t index dad04b1..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; diff --git a/t/prefetch/attrs_untouched.t b/t/prefetch/attrs_untouched.t index 1742770..53894b8 100644 --- a/t/prefetch/attrs_untouched.t +++ b/t/prefetch/attrs_untouched.t @@ -19,18 +19,6 @@ BEGIN { : ( tests => 3 ); } -# 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; -} - # bug in 0.07000 caused attr (join/prefetch) to be modifed by search # so we check the search & attr arrays are not modified my $search = { 'artist.name' => 'Caterwauler McCrae' }; diff --git a/t/prefetch/multiple_hasmany.t b/t/prefetch/multiple_hasmany.t index cee298a..7fc93812 100644 --- a/t/prefetch/multiple_hasmany.t +++ b/t/prefetch/multiple_hasmany.t @@ -20,18 +20,6 @@ BEGIN { : ( tests => 16 ); } -# 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; -} - # once the following TODO is complete, remove the 2 warning tests immediately # after the TODO block # (the TODO block itself contains tests ensuring that the warns are removed) diff --git a/t/prefetch/pollute_already_joined.t b/t/prefetch/pollute_already_joined.t index 035aa5b..152ca56 100644 --- a/t/prefetch/pollute_already_joined.t +++ b/t/prefetch/pollute_already_joined.t @@ -20,18 +20,6 @@ BEGIN { : ( tests => 10 ); } -# 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; -} - # A search() with prefetch seems to pollute an already joined resultset # in a way that offsets future joins (adapted from a test case by Debolaz) { diff --git a/t/prefetch/standard.t b/t/prefetch/standard.t index c25e010..56cf77d 100644 --- a/t/prefetch/standard.t +++ b/t/prefetch/standard.t @@ -20,18 +20,6 @@ BEGIN { : ( tests => 45 ); } -# 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; -} - my $queries = 0; $schema->storage->debugcb(sub { $queries++; }); $schema->storage->debug(1); @@ -160,11 +148,7 @@ $rs = $schema->resultset("CD")->search( { group_by => [qw/ title me.cdid /] } ); -SKIP: { - skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 1 - if $is_broken_sqlite; - cmp_ok( $rs->count, '==', 5, "count() ok after group_by on main pk" ); -} +cmp_ok( $rs->count, '==', 5, "count() ok after group_by on main pk" ); cmp_ok( scalar $rs->all, '==', 5, "all() returns same count as count() after group_by on main pk" ); @@ -173,11 +157,7 @@ $rs = $schema->resultset("CD")->search( { join => [qw/ artist /], group_by => [qw/ artist.name /] } ); -SKIP: { - skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 1 - if $is_broken_sqlite; - cmp_ok( $rs->count, '==', 3, "count() ok after group_by on related column" ); -} +cmp_ok( $rs->count, '==', 3, "count() ok after group_by on related column" ); $rs = $schema->resultset("Artist")->search( {}, @@ -195,11 +175,7 @@ $rs = $schema->resultset("Artist")->search( 'cds_2.title' => 'Forkful of bees' }, { join => [ 'cds', 'cds' ] }); -SKIP: { - skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 1 - if $is_broken_sqlite; - cmp_ok($rs->count, '==', 1, "single artist returned from multi-join"); -} +cmp_ok($rs->count, '==', 1, "single artist returned from multi-join"); is($rs->next->name, 'Caterwauler McCrae', "Correct artist returned");