more small cleanup, rename insert_or_update to update_or_insert

[dbsrgits/DBIx-Class.git] / t / run / 16joins.tl

diff --git a/t/run/16joins.tl b/t/run/16joins.tl
index bfab938..49ecbcf 100644 (file)
--- a/t/run/16joins.tl
+++ b/t/run/16joins.tl
@@ -73,7 +73,7 @@ my $rs = $schema->resultset("CD")->search(
                          ] ] }
          );
 
-cmp_ok( $rs->count, '==', 1, "Single record in resultset");
+cmp_ok( $rs + 0, '==', 1, "Single record in resultset");
 
 is($rs->first->title, 'Forkful of bees', 'Correct record returned');
 
@@ -81,7 +81,7 @@ $rs = $schema->resultset("CD")->search(
            { 'year' => 2001, 'artist.name' => 'Caterwauler McCrae' },
            { join => 'artist' });
 
-cmp_ok( $rs->count, '==', 1, "Single record in resultset");
+cmp_ok( $rs + 0, '==', 1, "Single record in resultset");
 
 is($rs->first->title, 'Forkful of bees', 'Correct record returned');
 
@@ -90,7 +90,7 @@ $rs = $schema->resultset("CD")->search(
              'liner_notes.notes' => 'Kill Yourself!' },
            { join => [ qw/artist liner_notes/ ] });
 
-cmp_ok( $rs->count, '==', 1, "Single record in resultset");
+cmp_ok( $rs + 0, '==', 1, "Single record in resultset");
 
 is($rs->first->title, 'Come Be Depressed With Us', 'Correct record returned');
 
@@ -114,7 +114,7 @@ $rs = $schema->resultset("CD")->search(
            { prefetch => [ qw/artist liner_notes/ ],
              order_by => 'me.cdid' });
 
-cmp_ok($rs->count, '==', 3, 'Correct number of records returned');
+cmp_ok($rs + 0, '==', 3, 'Correct number of records returned');
 
 # start test for prefetch SELECT count
 unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
@@ -144,10 +144,10 @@ $trace->close;
 unlink 't/var/dbic.trace';
 is($selects, 1, 'prefetch ran only 1 select statement');
 
-# test for partial prefetch via cols attr
+# test for partial prefetch via columns attr
 my $cd = $schema->resultset('CD')->find(1,
     {
-      cols => [qw/title artist.name/], 
+      columns => [qw/title artist.name/], 
       join => { 'artist' => {} }
     }
 );
@@ -255,12 +255,12 @@ SKIP: {
 
 $rs = $schema->resultset("Artist")->search(
   {},
-      { join => [qw/ cds /], group_by => [qw/ me.name /], having =>{ 'MAX(cds.cdid)'=>{'<',5 } } }
+      { join => [qw/ cds /], group_by => [qw/ me.name /], having =>{ 'MAX(cds.cdid)'=> \'< 5' } }
 );
 
 cmp_ok( $rs->all, '==', 2, "results ok after group_by on related column with a having" );
 
-$rs = $rs->search( undef, {  having =>{ 'count(*)'=>{'>',2 } }});
+$rs = $rs->search( undef, {  having =>{ 'count(*)'=> \'> 2' }});
 
 cmp_ok( $rs->all, '==', 1, "count() ok after group_by on related column with a having" );