From: Arthur Axel "fREW" Schmidt <frioux@gmail.com>
Date: Tue, 2 Feb 2010 04:12:29 +0000 (+0000)
Subject: revert actual changes from yesterday as per ribasushis advice
X-Git-Tag: v0.08119~20^2~16
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0485b0575277b63a8d8569d1e4c200ff061b22cd;p=dbsrgits%2FDBIx-Class.git

revert actual changes from yesterday as per ribasushis advice
---

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index ce46057..fc75fe7 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -2710,10 +2710,11 @@ sub _resolved_attrs_copy {
   return { %{$self->_resolved_attrs (@_)} };
 }
 
-sub _merge_attrs {
-  my $self  = shift;
-  my $attrs = shift;
+sub _resolved_attrs {
+  my $self = shift;
+  return $self->{_attrs} if $self->{_attrs};
 
+  my $attrs  = { %{ $self->{attrs} || {} } };
   my $source = $self->result_source;
   my $alias  = $attrs->{alias};
 
@@ -2766,13 +2767,13 @@ sub _merge_attrs {
   if ( $attrs->{select} ) {
     $attrs->{select} =
         ( ref $attrs->{select} eq 'ARRAY' )
-      ? $attrs->{select}
+      ? [ @{ $attrs->{select} } ]
       : [ $attrs->{select} ];
     $attrs->{as} = (
       $attrs->{as}
       ? (
         ref $attrs->{as} eq 'ARRAY'
-        ? $attrs->{as}
+        ? [ @{ $attrs->{as} } ]
         : [ $attrs->{as} ]
         )
       : [ map { m/^\Q${alias}.\E(.+)$/ ? $1 : $_ } @{ $attrs->{select} } ]
@@ -2798,17 +2799,6 @@ sub _merge_attrs {
     $adds = [$adds] unless ref $adds eq 'ARRAY';
     push @{ $attrs->{as} }, @$adds;
   }
-  return $attrs;
-}
-
-sub _resolved_attrs {
-  my $self = shift;
-  return $self->{_attrs} if $self->{_attrs};
-
-  my $attrs = $self->_merge_attrs({ %{ $self->{attrs} || {} } });
-  my $source = $self->result_source;
-  my $alias  = $attrs->{alias};
-
 
   $attrs->{from} ||= [ {
     -source_handle => $source->handle,