[Bast-commits] r6589 - in DBIx-Class/0.08/branches/mystery_join: lib/DBIx/Class t/search

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-06-10 11:33:14 +0000 (Wed, 10 Jun 2009)
New Revision: 6589

Modified:
   DBIx-Class/0.08/branches/mystery_join/lib/DBIx/Class/ResultSet.pm
   DBIx-Class/0.08/branches/mystery_join/t/search/preserve_original_rs.t
Log:
Duh, this was a pretty simple bug

Modified: DBIx-Class/0.08/branches/mystery_join/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/branches/mystery_join/lib/DBIx/Class/ResultSet.pm	2009-06-10 11:15:48 UTC (rev 6588)
+++ DBIx-Class/0.08/branches/mystery_join/lib/DBIx/Class/ResultSet.pm	2009-06-10 11:33:14 UTC (rev 6589)
@@ -2430,12 +2430,15 @@
   my $source = $self->result_source;
   my $attrs = $self->{attrs};
 
-  my $from = $attrs->{from}
-    || [ {
-      -result_source => $source,
-      -alias => $attrs->{alias},
-      $attrs->{alias} => $source->from,
-    } ];
+  my $from = [ @{
+      $attrs->{from}
+        ||
+      [{
+        -result_source => $source,
+        -alias => $attrs->{alias},
+        $attrs->{alias} => $source->from,
+      }]
+  }];
 
   my $seen = { %{$attrs->{seen_join} || {} } };
 

Modified: DBIx-Class/0.08/branches/mystery_join/t/search/preserve_original_rs.t
===================================================================
--- DBIx-Class/0.08/branches/mystery_join/t/search/preserve_original_rs.t	2009-06-10 11:15:48 UTC (rev 6588)
+++ DBIx-Class/0.08/branches/mystery_join/t/search/preserve_original_rs.t	2009-06-10 11:33:14 UTC (rev 6589)
@@ -80,9 +80,9 @@
 for my $s (qw/a2a artw cd artw_back/) {
   my $rs = $q{$s}{rs};
 
-  lives_ok ( sub { $rs->first }, "first on $s does not throw an exception" );
+  lives_ok ( sub { $rs->first }, "first() on $s does not throw an exception" );
 
-  lives_ok ( sub { $rs->count }, "count on $s does not throw an exception" );
+  lives_ok ( sub { $rs->count }, "count() on $s does not throw an exception" );
 
   is_same_sql_bind ($rs->as_query, $q{$s}{query}, "$s resultset unmodified (as_query matches)" );
 }