Some TODO test revisions prompted by RT#59565

diff --git a/Changes b/Changes
index ad96f1c..e9e8654 100644 (file)
--- a/Changes
+++ b/Changes
@@ -27,6 +27,8 @@ Revision history for DBIx::Class
         - Makefile.PL no longer imports GetOptions() to interoperate
           better with Catalyst installers
         - Bumped minimum Module::Install for developers
+        - Bumped DBD::SQLite dependency and removed some TODO markers
+          from tests
 
 0.08123 2010-06-12 14:46 (UTC)
     * Fixes

diff --git a/Makefile.PL b/Makefile.PL
index 43c23f5..0e4341d 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,7 +35,7 @@ perl_version '5.008001';
 all_from 'lib/DBIx/Class.pm';
 
 my $build_requires = {
-  'DBD::SQLite'              => '1.25',
+  'DBD::SQLite'              => '1.29',
 };
 
 my $test_requires = {

diff --git a/t/64db.t b/t/64db.t
index 14ad6e0..b207a29 100644 (file)
--- a/t/64db.t
+++ b/t/64db.t
@@ -1,5 +1,5 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
 use lib qw(t/lib);
@@ -47,9 +47,7 @@ is_deeply (
   'Correctly retrieve column info (no size or is_nullable)'
 );
 
-TODO: {
-  local $TODO = 'All current versions of SQLite seem to mis-report is_nullable';
-
+{
   is_deeply (
     get_storage_column_info ($schema->storage, 'artist', qw/size/),
     {

diff --git a/t/prefetch/via_search_related.t b/t/prefetch/via_search_related.t
index 40f7b8f..1942c14 100644 (file)
--- a/t/prefetch/via_search_related.t
+++ b/t/prefetch/via_search_related.t
@@ -9,6 +9,10 @@ use DBICTest;
 
 my $schema = DBICTest->init_schema();
 
+my $queries;
+my $debugcb = sub { $queries++; };
+my $orig_debug = $schema->storage->debug;
+
 lives_ok ( sub {
   my $no_prefetch = $schema->resultset('Track')->search_related(cd =>
     {
@@ -126,9 +130,19 @@ lives_ok (sub {
 
   TODO: {
     local $TODO = "This makes another 2 trips to the database, it can't be right";
+
+    $queries = 0;
+    $schema->storage->debugcb ($debugcb);
+    $schema->storage->debug (1);
+
     # artist -> 2 cds -> 2 genres -> 2 cds for each genre + distinct = 2
     is($rs->search_related('cds')->all, 2, 'prefetched distinct with prefetch (objects)');
     is($rs->search_related('cds')->count, 2, 'prefetched distinct with prefetch (count)');
+
+    is ($queries, 0, 'No extra queries fired (prefetch survives search_related)');
+
+    $schema->storage->debugcb (undef);
+    $schema->storage->debug ($orig_debug);
   }
 
 }, 'distinct generally works with prefetch on deep search_related chains');

diff --git a/t/row/inflate_result.t b/t/row/inflate_result.t
index c31d804..7606a54 100644 (file)
--- a/t/row/inflate_result.t
+++ b/t/row/inflate_result.t
@@ -91,7 +91,6 @@ TODO: {
 
     is( ref $user,  'My::Schema::Result::User' );
     is( ref $admin, 'My::Schema::Result::User::Admin' );
-
 }
 
 my $user  = $schema->resultset('User')->single($user_data);