removing code complexity concerning attribute lookup.

2 files changed, 8 insertions, 5 deletions

diff --git a/lib/active_relation/primitives/attribute.rb b/lib/active_relation/primitives/attribute.rb
index e6df5cd87c..893feefef2 100644
--- a/lib/active_relation/primitives/attribute.rb
+++ b/lib/active_relation/primitives/attribute.rb
@@ -5,6 +5,10 @@ module ActiveRelation
     def initialize(relation, name, aliaz = nil, ancestor = nil)
       @relation, @name, @alias, @ancestor = relation, name, aliaz, ancestor
     end
+    
+    def alias_or_name
+      @alias || name
+    end
 
     module Transformations
       def as(aliaz = nil)
@@ -96,9 +100,11 @@ module ActiveRelation
       strategy.attribute prefix, name, self.alias
     end
     
-    private
-    delegate :hash, :to => :relation
+    def hash
+      relation.hash + name.hash
+    end
     
+    private
     def prefix
       relation.prefix_for(self)
     end
diff --git a/lib/active_relation/primitives/expression.rb b/lib/active_relation/primitives/expression.rb
index a64219e9d1..ff07c40109 100644
--- a/lib/active_relation/primitives/expression.rb
+++ b/lib/active_relation/primitives/expression.rb
@@ -15,12 +15,10 @@ module ActiveRelation
       end
     
       def as(aliaz)
-        # key line -- note self
         Expression.new(attribute, function_sql, aliaz, self)
       end
       
       def to_attribute
-        # key line -- note self
         Attribute.new(relation, @alias, nil, self)
       end
     end
@@ -39,7 +37,6 @@ module ActiveRelation
       !(history & other.send(:history)).empty?
     end
 
-    private
     def hash
       attribute.hash + function_sql.hash
     end