X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F76joins.t;h=d98fd5a705a013618550fc1fbfc83a041420299c;hb=c0329273268971824784f239f32c7246e68da9c5;hp=934e387b00c5959c1d15abfa4c690bdcba1d1a97;hpb=49eeb48de3d8ff685926b595fa0f3f5e680eaee2;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/76joins.t b/t/76joins.t
index 934e387..d98fd5a 100644
--- a/t/76joins.t
+++ b/t/76joins.t
@@ -1,110 +1,22 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 use strict;
 use warnings;
 
 use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBIC::SqlMakerTest;
+use DBICTest ':DiffSQL';
 
 my $schema = DBICTest->init_schema();
 
-# test the abstract join => SQL generator
-my $sa = DBIx::Class::SQLMaker->new;
-
-my @j = (
-    { child => 'person' },
-    [ { father => 'person' }, { 'father.person_id' => 'child.father_id' }, ],
-    [ { mother => 'person' }, { 'mother.person_id' => 'child.mother_id' } ],
-);
-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_same_sql(
-  $sa->_recurse_from(@j),
-  $match,
-  'join 1 ok'
-);
-
-my @j2 = (
-    { mother => 'person' },
-    [   [   { child => 'person' },
-            [   { father             => 'person' },
-                { 'father.person_id' => 'child.father_id' }
-            ]
-        ],
-        { 'mother.person_id' => 'child.mother_id' }
-    ],
-);
-$match = 'person mother JOIN (person child JOIN person father ON ('
-       . ' father.person_id = child.father_id )) ON ( mother.person_id = '
-       . 'child.mother_id )'
-       ;
-is_same_sql(
-  $sa->_recurse_from(@j2),
-  $match,
-  'join 2 ok'
-);
-
-
-my @j3 = (
-    { child => 'person' },
-    [ { father => 'person', -join_type => 'inner' }, { 'father.person_id' => 'child.father_id' }, ],
-    [ { mother => 'person', -join_type => 'inner'  }, { 'mother.person_id' => 'child.mother_id' } ],
-);
-$match = 'person child INNER JOIN person father ON ( father.person_id = '
-          . 'child.father_id ) INNER JOIN person mother ON ( mother.person_id '
-          . '= child.mother_id )'
-          ;
-
-is_same_sql(
-  $sa->_recurse_from(@j3),
-  $match,
-  'join 3 (inner join) ok'
-);
-
-my @j4 = (
-    { mother => 'person' },
-    [   [   { child => 'person', -join_type => 'left' },
-            [   { father             => 'person', -join_type => 'right' },
-                { 'father.person_id' => 'child.father_id' }
-            ]
-        ],
-        { 'mother.person_id' => 'child.mother_id' }
-    ],
-);
-$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_same_sql(
-  $sa->_recurse_from(@j4),
-  $match,
-  'join 4 (nested joins + join types) ok'
-);
-
-my @j5 = (
-    { child => 'person' },
-    [ { father => 'person' }, { 'father.person_id' => \'!= child.father_id' }, ],
-    [ { mother => 'person' }, { 'mother.person_id' => 'child.mother_id' } ],
-);
-$match = 'person child JOIN person father ON ( father.person_id != '
-          . 'child.father_id ) JOIN person mother ON ( mother.person_id '
-          . '= child.mother_id )'
-          ;
-is_same_sql(
-  $sa->_recurse_from(@j5),
-  $match,
-  'join 5 (SCALAR reference for ON statement) ok'
-);
-
 my $rs = $schema->resultset("CD")->search(
            { 'year' => 2001, 'artist.name' => 'Caterwauler McCrae' },
-           { from => [ { 'me' => 'cd' },
-                         [
-                           { artist => 'artist' },
-                           { 'me.artist' => 'artist.artistid' }
-                         ] ] }
+           { from => [
+              { 'me' => 'cd' },
+              [
+                { artist => 'artist' },
+                { 'me.artist' => { -ident => 'artist.artistid' } },
+              ],
+           ] }
          );
 
 is( $rs + 0, 1, "Single record in resultset");