X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Ffrom_subquery.t;h=9b340c55409ba5a0af86a24b566f4314ffcb8ef3;hb=d0f52dd4982eca28140a950367a203b9b466c3d2;hp=5dc91d0bf844b15795f6b2276d8b8091a86e8a4e;hpb=866557f95aff945a895353c3235309afb22956ec;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/from_subquery.t b/t/from_subquery.t
index 5dc91d0..9b340c5 100644
--- a/t/from_subquery.t
+++ b/t/from_subquery.t
@@ -3,17 +3,12 @@ use warnings FATAL => 'all';
 
 use Test::More;
 
-BEGIN {
-    eval "use SQL::Abstract 1.49";
-    plan $@
-        ? ( skip_all => "Needs SQLA 1.49+" )
-        : ( tests => 8 );
-}
-
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
+plan tests => 8;
+
 my $schema = DBICTest->init_schema();
 my $art_rs = $schema->resultset('Artist');
 my $cdrs = $schema->resultset('CD');
@@ -23,10 +18,8 @@ my $cdrs = $schema->resultset('CD');
     artist_id => { 'in' => $art_rs->search({}, { rows => 1 })->get_column( 'id' )->as_query },
   });
 
-  my $arr = $cdrs2->as_query;
-  my ($query, @bind) = @{$$arr};
   is_same_sql_bind(
-    $query, \@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 ))",
     [],
   );
@@ -42,10 +35,8 @@ my $cdrs = $schema->resultset('CD');
     },
   );
 
-  my $arr = $rs->as_query;
-  my ($query, @bind) = @{$$arr};
   is_same_sql_bind(
-    $query, \@bind,
+    $rs->as_query,
     "(SELECT (SELECT id FROM cd me LIMIT 1) FROM artist me)",
     [],
   );
@@ -61,10 +52,8 @@ my $cdrs = $schema->resultset('CD');
     },
   );
 
-  my $arr = $rs->as_query;
-  my ($query, @bind) = @{$$arr};
   is_same_sql_bind(
-    $query, \@bind,
+    $rs->as_query,
     "(SELECT me.artistid, me.name, me.rank, me.charfield, (SELECT id FROM cd me LIMIT 1) FROM artist me)",
     [],
   );
@@ -82,10 +71,8 @@ my $cdrs = $schema->resultset('CD');
     },
   );
 
-  my $arr = $rs->as_query;
-  my ($query, @bind) = @{$$arr};
   is_same_sql_bind(
-    $query, \@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)",
     [
       [ 'id', 20 ]
@@ -102,10 +89,8 @@ my $cdrs = $schema->resultset('CD');
       { 'me.artistid' => 'cds_artist' } ] ]
   });
 
-  my $arr = $art_rs2->as_query;
-  my ($query, @bind) = @{$$arr};
   is_same_sql_bind(
-    $query, \@bind,
+    $art_rs2->as_query,
     "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me JOIN (SELECT me.artist as cds_artist FROM cd me) cds ON me.artistid = cds_artist)",
     []
   );
@@ -132,10 +117,8 @@ my $cdrs = $schema->resultset('CD');
     },
   );
 
-  my $arr = $rs->as_query;
-  my ($query, @bind) = @{$$arr};
   is_same_sql_bind(
-    $query, \@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 
@@ -160,10 +143,8 @@ my $cdrs = $schema->resultset('CD');
       )->get_column('year')->max_rs->as_query,
     },
   });
-  my $arr = $rs->as_query;
-  my ($query, @bind) = @{$$arr};
   is_same_sql_bind(
-    $query, \@bind,
+    $rs->as_query,
     "(SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE year = (SELECT MAX(inner.year) FROM cd inner WHERE artistid = me.artistid))",
     [],
   );
@@ -180,13 +161,9 @@ my $cdrs = $schema->resultset('CD');
     },
   );
 
-  my $arr = $rs->as_query;
-  my ($query, @bind) = @{$$arr};
   is_same_sql_bind(
-    $query, \@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)",
     [ [ 'title', 'Thriller' ] ],
   );
 }
-
-__END__