aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation/mutation_test.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-11-13 17:26:55 +0100
committerYves Senn <yves.senn@gmail.com>2013-11-19 17:40:21 +0100
commitf83c9b10b4c92b0d8deacb30d6fdfa2b1252d6dd (patch)
tree2320f2867a13a1f30faddadb92eb65c98bec8597 /activerecord/test/cases/relation/mutation_test.rb
parenta7afceec3e491bbf505c690b3019445593c04f68 (diff)
downloadrails-f83c9b10b4c92b0d8deacb30d6fdfa2b1252d6dd.tar.gz
rails-f83c9b10b4c92b0d8deacb30d6fdfa2b1252d6dd.tar.bz2
rails-f83c9b10b4c92b0d8deacb30d6fdfa2b1252d6dd.zip
use arel nodes to represent non-string `order_values`.
This fixes a bug when merging relations of different classes. ``` Given: Post.joins(:author).merge(Author.order(name: :desc)).to_sql Before: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "posts"."name" DESC After: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "authors"."name" DESC ```
Diffstat (limited to 'activerecord/test/cases/relation/mutation_test.rb')
-rw-r--r--activerecord/test/cases/relation/mutation_test.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/test/cases/relation/mutation_test.rb b/activerecord/test/cases/relation/mutation_test.rb
index 020fb24afa..a70f979442 100644
--- a/activerecord/test/cases/relation/mutation_test.rb
+++ b/activerecord/test/cases/relation/mutation_test.rb
@@ -7,10 +7,6 @@ module ActiveRecord
extend ActiveRecord::Delegation::DelegateCache
inherited self
- def arel_table
- Post.arel_table
- end
-
def connection
Post.connection
end
@@ -21,7 +17,7 @@ module ActiveRecord
end
def relation
- @relation ||= Relation.new FakeKlass.new('posts'), :b
+ @relation ||= Relation.new FakeKlass.new('posts'), Post.arel_table
end
(Relation::MULTI_VALUE_METHODS - [:references, :extending, :order]).each do |method|