Revert "Merge pull request #300 from jpcody/master"

This reverts commit 36836fa5e7, reversing
changes made to 53bc842664.

README.markdown

@@ -120,10 +120,10 @@ Aggregate functions `AVG`, `SUM`, `COUNT`, `MIN`, `MAX`, `HAVING`:
 
 ```ruby
 photos.group(photos[:user_id]).having(photos[:id].count.gt(5)) # => SELECT FROM photos GROUP BY photos.user_id HAVING COUNT(photos.id) > 5
-users.project(users[:age].sum) # => SELECT SUM(users.age) FROM users
-users.project(users[:age].average) # => SELECT AVG(users.age) FROM users
-users.project(users[:age].maximum) # => SELECT MAX(users.age) FROM users
-users.project(users[:age].minimum) # => SELECT MIN(users.age) FROM users
+users.project(users[:age].sum) # => SELECT SUM(users.age) AS sum_id FROM users
+users.project(users[:age].average) # => SELECT AVG(users.age) AS avg_id FROM users
+users.project(users[:age].maximum) # => SELECT MAX(users.age) AS max_id FROM users
+users.project(users[:age].minimum) # => SELECT MIN(users.age) AS min_id FROM users
 users.project(users[:age].count) # => SELECT COUNT(users.age) FROM users
 ```
 
@@ -201,7 +201,7 @@ users.
   project(users[:id], cte_table[:click].sum).
   with(composed_cte)
 
-# => WITH cte_table AS (SELECT FROM photos  WHERE photos.created_at > '2014-05-02') SELECT users.id, SUM(cte_table.click) FROM users INNER JOIN cte_table ON users.id = cte_table.user_id
+# => WITH cte_table AS (SELECT FROM photos  WHERE photos.created_at > '2014-05-02') SELECT users.id, SUM(cte_table.click) AS sum_id FROM users INNER JOIN cte_table ON users.id = cte_table.user_id
 ```
 
 When your query is too complex for `Arel`, you can use `Arel::SqlLiteral`:

lib/arel/expressions.rb

@@ -5,24 +5,23 @@ module Arel
     end
 
     def sum
-      Nodes::Sum.new [self]
+      Nodes::Sum.new [self], Nodes::SqlLiteral.new('sum_id')
     end
 
     def maximum
-      Nodes::Max.new [self]
+      Nodes::Max.new [self], Nodes::SqlLiteral.new('max_id')
     end
 
     def minimum
-      Nodes::Min.new [self]
+      Nodes::Min.new [self], Nodes::SqlLiteral.new('min_id')
     end
 
     def average
-      Nodes::Avg.new [self]
+      Nodes::Avg.new [self], Nodes::SqlLiteral.new('avg_id')
     end
 
     def extract field
       Nodes::Extract.new [self], field
     end
-
   end
 end

test/attributes/test_attribute.rb

@@ -82,7 +82,7 @@ module Arel
           mgr = users.project(Arel.star).where(users[:karma].gt(avg))
 
           mgr.to_sql.must_be_like %{
-            SELECT * FROM "users" WHERE "users"."karma" > (SELECT AVG("users"."karma") FROM "users")
+            SELECT * FROM "users" WHERE "users"."karma" > (SELECT AVG("users"."karma") AS avg_id FROM "users")
           }
         end
 
@@ -313,11 +313,12 @@ module Arel
           relation[:id].average.must_be_kind_of Nodes::Avg
         end
 
-        it 'should generate the proper SQL' do
+        # FIXME: backwards compat. Is this really necessary?
+        it 'should set the alias to "avg_id"' do
           relation = Table.new(:users)
           mgr = relation.project relation[:id].average
           mgr.to_sql.must_be_like %{
-            SELECT AVG("users"."id")
+            SELECT AVG("users"."id") AS avg_id
             FROM "users"
           }
         end
@@ -329,11 +330,12 @@ module Arel
           relation[:id].maximum.must_be_kind_of Nodes::Max
         end
 
-        it 'should generate the proper SQL' do
+        # FIXME: backwards compat. Is this really necessary?
+        it 'should set the alias to "max_id"' do
           relation = Table.new(:users)
           mgr = relation.project relation[:id].maximum
           mgr.to_sql.must_be_like %{
-            SELECT MAX("users"."id")
+            SELECT MAX("users"."id") AS max_id
             FROM "users"
           }
         end
@@ -352,11 +354,12 @@ module Arel
           relation[:id].sum.must_be_kind_of Nodes::Sum
         end
 
-        it 'should generate the proper SQL' do
+        # FIXME: backwards compat. Is this really necessary?
+        it 'should set the alias to "sum_id"' do
           relation = Table.new(:users)
           mgr = relation.project relation[:id].sum
           mgr.to_sql.must_be_like %{
-            SELECT SUM("users"."id")
+            SELECT SUM("users"."id") AS sum_id
             FROM "users"
           }
         end