From 9376459a7186b794b29e11c55186135004e8f3b8 Mon Sep 17 00:00:00 2001 From: Nick Kallen Date: Wed, 14 May 2008 20:33:23 -0700 Subject: fixed defect with select inside of alias joined to the same table (yikes) --- lib/arel/primitives/attribute.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/arel/primitives') diff --git a/lib/arel/primitives/attribute.rb b/lib/arel/primitives/attribute.rb index 5f8618ddfc..22ee37524e 100644 --- a/lib/arel/primitives/attribute.rb +++ b/lib/arel/primitives/attribute.rb @@ -47,11 +47,7 @@ module Arel module Transformations def self.included(klass) - alias_method :eql?, :== - end - - def hash - name.hash + history.size.hash + klass.hash_on :name end def as(aliaz = nil) @@ -70,7 +66,7 @@ module Arel module Congruence def history - @history ||= [self] + (ancestor ? [ancestor, ancestor.history].flatten : []) + @history ||= [self] + (ancestor ? ancestor.history : []) end def match?(other) -- cgit v1.2.3