Now SQLA 1.50 compatible - no changes to tests, no additions. Just compat

[dbsrgits/DBIx-Class.git] / t / 76joins.t

diff --git a/t/76joins.t b/t/76joins.t
index f384d4d..69426fd 100644 (file)
--- a/t/76joins.t
+++ b/t/76joins.t
@@ -5,6 +5,7 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 use Data::Dumper;
+use DBIC::SqlMakerTest;
 
 my $schema = DBICTest->init_schema();
 
@@ -16,7 +17,7 @@ BEGIN {
     eval "use DBD::SQLite";
     plan $@
         ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 63 );
+        : ( tests => 64 );
 }
 
 # figure out if we've got a version of sqlite that is older than 3.2.6, in
@@ -43,7 +44,13 @@ my $match = 'person child JOIN person father ON ( father.person_id = '
           . 'child.father_id ) JOIN person mother ON ( mother.person_id '
           . '= child.mother_id )'
           ;
-is( $sa->_recurse_from(@j), $match, 'join 1 ok' );
+ok (eq_sql
+  (
+    $sa->_recurse_from(@j),
+    $match,
+  ),
+  'join 1 ok'
+);
 
 my @j2 = (
     { mother => 'person' },
@@ -59,7 +66,14 @@ $match = 'person mother JOIN (person child JOIN person father ON ('
        . ' father.person_id = child.father_id )) ON ( mother.person_id = '
        . 'child.mother_id )'
        ;
-is( $sa->_recurse_from(@j2), $match, 'join 2 ok' );
+ok (eq_sql
+  (
+    $sa->_recurse_from(@j2),
+    $match,
+  ),
+  'join 2 ok'
+);
+
 
 my @j3 = (
     { child => 'person' },
@@ -71,7 +85,13 @@ $match = 'person child INNER JOIN person father ON ( father.person_id = '
           . '= child.mother_id )'
           ;
 
-is( $sa->_recurse_from(@j3), $match, 'join 3 (inner join) ok');
+ok (eq_sql
+  (
+    $sa->_recurse_from(@j3),
+    $match,
+  ),
+  'join 3 (inner join) ok'
+);
 
 my @j4 = (
     { mother => 'person' },
@@ -87,7 +107,13 @@ $match = 'person mother LEFT JOIN (person child RIGHT JOIN person father ON ('
        . ' father.person_id = child.father_id )) ON ( mother.person_id = '
        . 'child.mother_id )'
        ;
-is( $sa->_recurse_from(@j4), $match, 'join 4 (nested joins + join types) ok');
+ok (eq_sql
+  (
+    $sa->_recurse_from(@j4),
+    $match,
+  ),
+  'join 4 (nested joins + join types) ok'
+);
 
 my @j5 = (
     { child => 'person' },
@@ -98,7 +124,13 @@ $match = 'person child JOIN person father ON ( father.person_id != '
           . 'child.father_id ) JOIN person mother ON ( mother.person_id '
           . '= child.mother_id )'
           ;
-is( $sa->_recurse_from(@j5), $match, 'join 5 (SCALAR reference for ON statement) ok' );
+ok (eq_sql
+  (
+    $sa->_recurse_from(@j5),
+    $match,
+  ),
+  'join 5 (SCALAR reference for ON statement) ok'
+);
 
 my @j6 = (
     { child => 'person' },
@@ -146,6 +178,9 @@ $rs = $schema->resultset("CD")->search(
 );
 cmp_ok( scalar $rs->all, '==', scalar $rs->slice(0, $rs->count - 1), 'slice() with join has same count as all()' );
 
+ok(!$rs->slice($rs->count+1000, $rs->count+1002)->count,
+  'Slicing beyond end of rs returns a zero count');
+
 $rs = $schema->resultset("Artist")->search(
         { 'liner_notes.notes' => 'Kill Yourself!' },
         { join => { 'cds' => 'liner_notes' } });
@@ -244,11 +279,7 @@ $cd = $schema->resultset('CD')->find(1, { prefetch => { cd_to_producer => 'produ
 
 is($cd->producers->first->name, 'Matt S Trout', 'many_to_many accessor ok');
 
-TODO: {
-  local $TODO = 'use prefetched values for many_to_many accessor';
-
-  is($queries, 1, 'many_to_many accessor with nested prefetch ran exactly 1 query');
-}
+is($queries, 1, 'many_to_many accessor with nested prefetch ran exactly 1 query');
 
 $queries = 0;
 
@@ -336,21 +367,18 @@ SKIP: {
 
 is($rs->next->name, 'Caterwauler McCrae', "Correct artist returned");
 
-TODO:  {
-    local $TODO = 'left join on prefetch to return valid rows';
-    my $cd = $schema->resultset('Artist')->first->create_related('cds',
-        {
-        title   => 'Unproduced Single',
-        year    => 2007
-    });
+$cd = $schema->resultset('Artist')->first->create_related('cds',
+    {
+    title   => 'Unproduced Single',
+    year    => 2007
+});
 
-    my $left_join = $schema->resultset('CD')->search(
-        { 'me.cdid' => $cd->cdid },
-        { prefetch => { cd_to_producer => 'producer' } }
-    );
+my $left_join = $schema->resultset('CD')->search(
+    { 'me.cdid' => $cd->cdid },
+    { prefetch => { cd_to_producer => 'producer' } }
+);
 
-    cmp_ok($left_join, '==', 1, 'prefetch with no join record present');
-}
+cmp_ok($left_join, '==', 1, 'prefetch with no join record present');
 
 $queries = 0;
 $schema->storage->debugcb(sub { $queries++ });