From: Matt S Trout <mst@shadowcat.co.uk>
Date: Wed, 24 May 2006 02:23:49 +0000 (+0000)
Subject: Merge 'resultset-new-refactor' into 'DBIx-Class-current'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9d29cf57a7ed1b68277ff2b7ee58d46112d8c384;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'resultset-new-refactor' into 'DBIx-Class-current'
---

9d29cf57a7ed1b68277ff2b7ee58d46112d8c384
diff --cc lib/DBIx/Class/ResultSet.pm
index 8fc894d,4a164d4..e94782f
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@@ -367,7 -328,7 +328,8 @@@ sub find 
  
      # Add the ResultSet's alias
      foreach my $key (grep { ! m/\./ } keys %$unique_query) {
--      $unique_query->{"$self->{attrs}{alias}.$key"} = delete $unique_query->{$key};
++      my $alias = $self->{attrs}->{alias};
++      $unique_query->{"$alias.$key"} = delete $unique_query->{$key};
      }
  
      push @unique_queries, $unique_query if %$unique_query;