X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F90join_torture.t;h=27111e4479331b02b01dc63a7ff20a1b5c9cf30b;hb=fcdd56ca536a7751e2cf5a2c9ba62424c7f18122;hp=0692c3a71a0416296e3d853ebb261239e8e7e87f;hpb=fe0708a2d68b5d34b6bc6f7e70164c3e569f1dd0;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/90join_torture.t b/t/90join_torture.t
index 0692c3a..27111e4 100644
--- a/t/90join_torture.t
+++ b/t/90join_torture.t
@@ -5,8 +5,7 @@ use Test::More;
 use Test::Exception;
 
 use lib qw(t/lib);
-use DBICTest;
-use DBIC::SqlMakerTest;
+use DBICTest ':DiffSQL';
 my $schema = DBICTest->init_schema();
 
 lives_ok (sub {
@@ -50,11 +49,12 @@ lives_ok (sub {
           ON producer_2.producerid = cd_to_producer_2.producer
         JOIN artist artist ON artist.artistid = me.artist
       WHERE ( ( producer.name = ? AND producer_2.name = ? ) )
-      ORDER BY cd_to_producer.cd, producer_to_cd.producer
     )',
     [
-      [ 'producer.name' => 'blah' ],
-      [ 'producer_2.name' => 'foo' ],
+      [ { sqlt_datatype => 'varchar', dbic_colname => 'producer.name', sqlt_size => 100 }
+          => 'blah' ],
+      [ { sqlt_datatype => 'varchar', dbic_colname => 'producer_2.name', sqlt_size => 100 }
+          => 'foo' ],
     ],
   );
 
@@ -77,7 +77,9 @@ cmp_ok(scalar($rs3->all), '==', 15, "All cds for artist returned");
 
 cmp_ok($rs3->count, '==', 15, "All cds for artist returned via count");
 
-my $rs4 = $schema->resultset("CD")->search({ 'artist.artistid' => '1' }, { join => ['tracks', 'artist'], prefetch => 'artist' });
+my $rs4 = $schema->resultset("CD")->search({ 'artist.artistid' => '1' }, {
+  join => ['tracks', 'artist'], prefetch => 'artist', order_by => 'me.cdid'
+});
 my @rs4_results = $rs4->all;
 
 is($rs4_results[0]->cdid, 1, "correct artist returned");