removed function_sql in favor of polymorphism

Conflicts:

	lib/arel/algebra/primitives/attribute.rb
	lib/arel/algebra/primitives/expression.rb
	spec/arel/unit/primitives/expression_spec.rb

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/arel/unit/primitives/attribute_spec.rb b/spec/arel/unit/primitives/attribute_spec.rb
index 6d0f146a39..e512b40ebf 100644
--- a/spec/arel/unit/primitives/attribute_spec.rb
+++ b/spec/arel/unit/primitives/attribute_spec.rb
@@ -139,31 +139,31 @@ module Arel
 
       describe '#count' do
         it "manufactures a count Expression" do
-          @attribute.count.should == Expression.new(@attribute, "COUNT")
+          @attribute.count.should == Count.new(@attribute)
         end
       end
 
       describe '#sum' do
         it "manufactures a sum Expression" do
-          @attribute.sum.should == Expression.new(@attribute, "SUM")
+          @attribute.sum.should == Sum.new(@attribute)
         end
       end
 
       describe '#maximum' do
         it "manufactures a maximum Expression" do
-          @attribute.maximum.should == Expression.new(@attribute, "MAX")
+          @attribute.maximum.should == Maximum.new(@attribute)
         end
       end
 
       describe '#minimum' do
         it "manufactures a minimum Expression" do
-          @attribute.minimum.should == Expression.new(@attribute, "MIN")
+          @attribute.minimum.should == Minimum.new(@attribute)
         end
       end
 
       describe '#average' do
         it "manufactures an average Expression" do
-          @attribute.average.should == Expression.new(@attribute, "AVG")
+          @attribute.average.should == Average.new(@attribute)
         end
       end
     end