X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fresultset%2Fas_query.t;h=c49608512335af1f463cdfa0a4a0f27dd02a31b9;hb=e532cb4b6bf15c76b2fb502132952276d3333b0d;hp=23f301f9ef92f0552f619c6448bc0134d24dfbc1;hpb=658fa250be6ed1944d042ccf985d5c05d41111f6;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index 23f301f..c496085 100644
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -3,51 +3,65 @@
 use strict;
 use warnings FATAL => 'all';
 
+use Data::Dumper;
+
 use Test::More;
+
+plan ( tests => 4 );
+
 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 $schema = DBICTest->init_schema();
+my $art_rs = $schema->resultset('Artist');
+my $cdrs = $schema->resultset('CD');
 
 {
   my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+  my ($query, @bind) = @{$$arr};
 
-  is( $query, "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me" );
-  is_deeply( \@bind, [] );
+  is_same_sql_bind(
+    $query, \@bind,
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me)", [],
+  );
 }
 
 $art_rs = $art_rs->search({ name => 'Billy Joel' });
 
 {
   my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+  my ($query, @bind) = @{$$arr};
 
-  is( $query, "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? )" );
-  is_deeply( \@bind, [ [ name => 'Billy Joel' ] ] );
+  is_same_sql_bind(
+    $query, \@bind,
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? ))",
+    [ [ name => 'Billy Joel' ] ],
+  );
 }
 
 $art_rs = $art_rs->search({ rank => 2 });
 
 {
   my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+  my ($query, @bind) = @{$$arr};
 
-  is( $query, "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) )" );
-  is_deeply( \@bind, [ [ rank => 2 ], [ name => 'Billy Joel' ] ] );
+  is_same_sql_bind(
+    $query, \@bind,
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
+    [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
+  );
 }
 
 my $rscol = $art_rs->get_column( 'charfield' );
 
 {
   my $arr = $rscol->as_query;
-  my ($query, @bind) = @$arr;
+  my ($query, @bind) = @{$$arr};
 
-  is( $query, "SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) )" );
-  is_deeply( \@bind, [ [ rank => 2 ], [ name => 'Billy Joel' ] ] );
+  is_same_sql_bind(
+    $query, \@bind,
+    "(SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
+    [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
+  );
 }
-
-__END__