X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Ffrom_subquery.t;h=34b88dc4257830de833c199705ce18b07dc28a34;hb=37aafa2ede65e38af8fe9eda374ad4626290932f;hp=646fa6e36b6c79891929836c3b3e2e3748931e9d;hpb=be83e9ecb1ca397fb151daef9fefd131b3965c99;p=dbsrgits%2FDBIx-Class.git diff --git a/t/from_subquery.t b/t/from_subquery.t index 646fa6e..34b88dc 100644 --- a/t/from_subquery.t +++ b/t/from_subquery.t @@ -20,7 +20,7 @@ my $cdrs = $schema->resultset('CD'); is_same_sql_bind( $cdrs2->as_query, - "(SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE artist_id IN ( SELECT id FROM artist me LIMIT 1 ))", + "(SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE artist_id IN ( SELECT me.id FROM artist me LIMIT 1 ))", [], ); } @@ -37,7 +37,7 @@ my $cdrs = $schema->resultset('CD'); is_same_sql_bind( $rs->as_query, - "(SELECT (SELECT id FROM cd me LIMIT 1) FROM artist me)", + "(SELECT (SELECT me.id FROM cd me LIMIT 1) FROM artist me)", [], ); } @@ -54,7 +54,7 @@ my $cdrs = $schema->resultset('CD'); is_same_sql_bind( $rs->as_query, - "(SELECT me.artistid, me.name, me.rank, me.charfield, (SELECT id FROM cd me LIMIT 1) FROM artist me)", + "(SELECT me.artistid, me.name, me.rank, me.charfield, (SELECT me.id FROM cd me LIMIT 1) FROM artist me)", [], ); } @@ -73,7 +73,9 @@ my $cdrs = $schema->resultset('CD'); is_same_sql_bind( $rs->as_query, - "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE ( id > ? ) ) cd2)", + "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM ( + SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE ( id > ? ) + ) cd2)", [ [ 'id', 20 ] ], @@ -119,11 +121,11 @@ my $cdrs = $schema->resultset('CD'); is_same_sql_bind( $rs->as_query, - "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track - FROM - (SELECT cd3.cdid,cd3.artist,cd3.title,cd3.year,cd3.genreid,cd3.single_track - FROM - (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track + "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track + FROM + (SELECT cd3.cdid, cd3.artist, cd3.title, cd3.year, cd3.genreid, cd3.single_track + FROM + (SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE ( id < ? ) ) cd3 WHERE ( id > ? ) ) cd2)", [ @@ -163,7 +165,9 @@ my $cdrs = $schema->resultset('CD'); is_same_sql_bind( $rs->as_query, - "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE ( title = ? ) ) cd2)", + "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM ( + SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE ( title = ? ) + ) cd2)", [ [ 'title', 'Thriller' ] ], ); }