Merge 'column_attr' into 'trunk'

[dbsrgits/DBIx-Class.git] / t / resultset / as_query.t

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index 43c8ddd..5071f0c 100644 (file)
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -3,13 +3,21 @@
 use strict;
 use warnings FATAL => 'all';
 
+use Data::Dumper;
+
 use Test::More;
+
+BEGIN {
+    eval "use SQL::Abstract 1.49";
+    plan $@
+        ? ( skip_all => "Needs SQLA 1.49+" )
+        : ( tests => 4 );
+}
+
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
-plan tests => 4;
-
 my $schema = DBICTest->init_schema();
 my $art_rs = $schema->resultset('Artist');
 my $cdrs = $schema->resultset('CD');
@@ -20,7 +28,7 @@ my $cdrs = $schema->resultset('CD');
 
   is_same_sql_bind(
     $query, \@bind,
-    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me", [],
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me)", [],
   );
 }
 
@@ -32,7 +40,7 @@ $art_rs = $art_rs->search({ name => 'Billy Joel' });
 
   is_same_sql_bind(
     $query, \@bind,
-    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? )",
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? ))",
     [ [ name => 'Billy Joel' ] ],
   );
 }
@@ -45,7 +53,7 @@ $art_rs = $art_rs->search({ rank => 2 });
 
   is_same_sql_bind(
     $query, \@bind,
-    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) )",
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
     [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
   );
 }
@@ -58,23 +66,9 @@ my $rscol = $art_rs->get_column( 'charfield' );
 
   is_same_sql_bind(
     $query, \@bind,
-    "SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) )",
+    "(SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
     [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
   );
 }
 
-my $cdrs2 = $cdrs->search({
-  artist_id => {
-    -in => $art_rs->get_column( 'id' )->as_query,
-  },
-});
-
-my @x = $cdrs2->all;
-use Data::Dumper; warn Dumper \@x;
-__END__
-{
-  my $arr = $cdrs2->as_query;
-  my ($query, @bind) = @{$$arr};
-}
-
 __END__