[Bast-commits] r3265 - branches/DBIx-Class-current/lib/DBIx/Class

[ash at dev.catalyst.perl.org]

Author: ash
Date: 2007-05-08 20:35:36 +0100 (Tue, 08 May 2007)
New Revision: 3265

Modified:
   branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm
   branches/DBIx-Class-current/lib/DBIx/Class/Row.pm
Log:
Unbreak back-compat

Modified: branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm
===================================================================
--- branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm	2007-05-08 18:01:37 UTC (rev 3264)
+++ branches/DBIx-Class-current/lib/DBIx/Class/ResultSet.pm	2007-05-08 19:35:36 UTC (rev 3265)
@@ -1264,9 +1264,10 @@
   my %new = (
     %{ $self->_remove_alias($values, $alias) },
     %{ $self->_remove_alias($collapsed_cond, $alias) },
+    -source_handle => $self->_source_handle
   );
 
-  return $self->result_class->new(\%new,$self->_source_handle);
+  return $self->result_class->new(\%new);
 }
 
 # _collapse_cond

Modified: branches/DBIx-Class-current/lib/DBIx/Class/Row.pm
===================================================================
--- branches/DBIx-Class-current/lib/DBIx/Class/Row.pm	2007-05-08 18:01:37 UTC (rev 3264)
+++ branches/DBIx-Class-current/lib/DBIx/Class/Row.pm	2007-05-08 19:35:36 UTC (rev 3265)
@@ -30,13 +30,15 @@
 =cut
 
 sub new {
-  my ($class, $attrs, $source) = @_;
+  my ($class, $attrs) = @_;
   $class = ref $class if ref $class;
 
   my $new = { _column_data => {} };
   bless $new, $class;
 
-  $new->_source_handle($source) if $source;
+  if (my $handle = delete $attrs->{-source_handle}) {
+    $new->_source_handle($handle);
+  }
 
   if ($attrs) {
     $new->throw_exception("attrs must be a hashref")