Merge 'trunk' into 'multi_stuff'

r5537@rkinyon-lt-osx (orig r5536):  robkinyon | 2009-02-19 22:11:07 -0500
 r5529@rkinyon-lt-osx (orig r5528):  michaelr | 2009-02-18 21:24:44 -0500
 added another TODO test for a nested from =>

 r5536@rkinyon-lt-osx (orig r5535):  robkinyon | 2009-02-19 22:07:24 -0500
 Fixed failing test

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index 2813b1d..b573606 100644 (file)
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -22,7 +22,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)", [],
   );
 }
 
@@ -34,7 +34,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' ] ],
   );
 }
@@ -47,7 +47,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' ] ],
   );
 }
@@ -60,7 +60,7 @@ 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' ] ],
   );
 }

diff --git a/t/search/subquery.t b/t/search/subquery.t
index 47e0746..1a6861a 100644 (file)
--- a/t/search/subquery.t
+++ b/t/search/subquery.t
@@ -10,7 +10,7 @@ use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
-plan tests => 4;
+plan tests => 5;
 
 my $schema = DBICTest->init_schema();
 my $art_rs = $schema->resultset('Artist');
@@ -74,6 +74,26 @@ TODO: {
   );
 }
 
+# nested from
+TODO: {
+  local $TODO = "'from' doesn't work with as_query yet.";
+  my $art_rs2 = $schema->resultset('Artist')->search({}, 
+  {
+    from => [ { 'me' => 'artist' }, 
+      [ { 'cds' => $cdrs->search({},{ 'select' => [\'me.artist as cds_artist' ]})->as_query },
+      { 'me.artistid' => 'cds_artist' } ] ]
+  });
+
+  my $arr = $art_rs2->as_query;
+  my ($query, @bind) = @{$$arr};
+  is_same_sql_bind(
+    $query, \@bind,
+    "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", []
+  );
+
+
+}
+
 {
   my $rs = $cdrs->search({
     year => {