aboutsummaryrefslogtreecommitdiffstats
path: root/test/attributes
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2014-10-30 12:40:41 -0600
committerSean Griffin <sean@thoughtbot.com>2014-10-30 12:40:41 -0600
commit9b92af7098b2728ced578ab9a7679176d20f120f (patch)
treec17af0e6808c757a624341644f2cb265a29e29cb /test/attributes
parent7db0e4accff919f0a7aea875fbc8d9f5696ecb69 (diff)
downloadrails-9b92af7098b2728ced578ab9a7679176d20f120f.tar.gz
rails-9b92af7098b2728ced578ab9a7679176d20f120f.tar.bz2
rails-9b92af7098b2728ced578ab9a7679176d20f120f.zip
Revert "Merge pull request #300 from jpcody/master"
This reverts commit 36836fa5e7c084c0dce2818577e6fd0cf815f786, reversing changes made to 53bc8426648cc93695525e8f12102cd416b2d772.
Diffstat (limited to 'test/attributes')
-rw-r--r--test/attributes/test_attribute.rb17
1 files changed, 10 insertions, 7 deletions
diff --git a/test/attributes/test_attribute.rb b/test/attributes/test_attribute.rb
index 500f9385f8..6cfe9fbcbf 100644
--- a/test/attributes/test_attribute.rb
+++ b/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