Massively refactor and sanify condition collapsing

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

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index 0e77078..39bf88c 100644 (file)
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -3,8 +3,6 @@ use warnings;
 
 use Test::More;
 
-plan ( tests => 5 );
-
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
@@ -45,8 +43,8 @@ my $rank_resolved_bind = [
 {
   is_same_sql_bind(
     $art_rs->as_query,
-    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
-    [ $rank_resolved_bind, $name_resolved_bind ],
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE name = ? AND rank = ? )",
+    [ $name_resolved_bind, $rank_resolved_bind ],
   );
 }
 
@@ -55,8 +53,8 @@ my $rscol = $art_rs->get_column( 'charfield' );
 {
   is_same_sql_bind(
     $rscol->as_query,
-    "(SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
-    [ $rank_resolved_bind, $name_resolved_bind ],
+    "(SELECT me.charfield FROM artist me WHERE name = ? AND rank = ? )",
+    [ $name_resolved_bind, $rank_resolved_bind ],
   );
 }
 
@@ -68,3 +66,28 @@ my $rscol = $art_rs->get_column( 'charfield' );
   my $subsel_rs = $schema->resultset("CD")->search( { cdid => { IN => $rs->get_column('cdid')->as_query } } );
   is($subsel_rs->count, $rs->count, 'Subselect on PK got the same row count');
 }
+
+
+is_same_sql_bind($schema->resultset('Artist')->search({
+   rank => 1,
+}, {
+   from => $schema->resultset('Artist')->search({ 'name' => 'frew'})->as_query,
+})->as_query,
+   '(SELECT me.artistid, me.name, me.rank, me.charfield FROM (
+     SELECT me.artistid, me.name, me.rank, me.charfield FROM
+       artist me
+       WHERE (
+         ( name = ? )
+       )
+     ) WHERE (
+       ( rank = ? )
+     )
+   )',
+   [
+      [{ dbic_colname => 'name', sqlt_datatype => 'varchar', sqlt_size => 100 }, 'frew'],
+      [{ dbic_colname => 'rank' }, 1],
+   ],
+   'from => ...->as_query works'
+);
+
+done_testing;