[Bast-commits] r6277 - in DBIx-Class/0.08/trunk/t: . prefetch
ribasushi at dev.catalyst.perl.org
ribasushi at dev.catalyst.perl.org
Sat May 16 06:02:18 GMT 2009
Author: ribasushi
Date: 2009-05-16 06:02:18 +0000 (Sat, 16 May 2009)
New Revision: 6277
Modified:
DBIx-Class/0.08/trunk/t/60core.t
DBIx-Class/0.08/trunk/t/76joins.t
DBIx-Class/0.08/trunk/t/prefetch/attrs_untouched.t
DBIx-Class/0.08/trunk/t/prefetch/multiple_hasmany.t
DBIx-Class/0.08/trunk/t/prefetch/pollute_already_joined.t
DBIx-Class/0.08/trunk/t/prefetch/standard.t
Log:
Cleanup tests
Modified: DBIx-Class/0.08/trunk/t/60core.t
===================================================================
--- DBIx-Class/0.08/trunk/t/60core.t 2009-05-15 22:46:00 UTC (rev 6276)
+++ DBIx-Class/0.08/trunk/t/60core.t 2009-05-16 06:02:18 UTC (rev 6277)
@@ -13,19 +13,6 @@
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 @@
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(
{},
{
Modified: DBIx-Class/0.08/trunk/t/76joins.t
===================================================================
--- DBIx-Class/0.08/trunk/t/76joins.t 2009-05-15 22:46:00 UTC (rev 6276)
+++ DBIx-Class/0.08/trunk/t/76joins.t 2009-05-16 06:02:18 UTC (rev 6277)
@@ -20,18 +20,6 @@
: ( 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;
Modified: DBIx-Class/0.08/trunk/t/prefetch/attrs_untouched.t
===================================================================
--- DBIx-Class/0.08/trunk/t/prefetch/attrs_untouched.t 2009-05-15 22:46:00 UTC (rev 6276)
+++ DBIx-Class/0.08/trunk/t/prefetch/attrs_untouched.t 2009-05-16 06:02:18 UTC (rev 6277)
@@ -19,18 +19,6 @@
: ( 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' };
Modified: DBIx-Class/0.08/trunk/t/prefetch/multiple_hasmany.t
===================================================================
--- DBIx-Class/0.08/trunk/t/prefetch/multiple_hasmany.t 2009-05-15 22:46:00 UTC (rev 6276)
+++ DBIx-Class/0.08/trunk/t/prefetch/multiple_hasmany.t 2009-05-16 06:02:18 UTC (rev 6277)
@@ -20,18 +20,6 @@
: ( 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)
Modified: DBIx-Class/0.08/trunk/t/prefetch/pollute_already_joined.t
===================================================================
--- DBIx-Class/0.08/trunk/t/prefetch/pollute_already_joined.t 2009-05-15 22:46:00 UTC (rev 6276)
+++ DBIx-Class/0.08/trunk/t/prefetch/pollute_already_joined.t 2009-05-16 06:02:18 UTC (rev 6277)
@@ -20,18 +20,6 @@
: ( 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)
{
Modified: DBIx-Class/0.08/trunk/t/prefetch/standard.t
===================================================================
--- DBIx-Class/0.08/trunk/t/prefetch/standard.t 2009-05-15 22:46:00 UTC (rev 6276)
+++ DBIx-Class/0.08/trunk/t/prefetch/standard.t 2009-05-16 06:02:18 UTC (rev 6277)
@@ -20,18 +20,6 @@
: ( 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 @@
{ 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 @@
{ 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 @@
'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");
More information about the Bast-commits
mailing list