aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-06-26 02:23:35 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-06-26 02:23:35 +0900
commit5dafa72935fbb0656f814f26f94e46f545890214 (patch)
tree50192a0e6488643d674fd6408379aed85dc87f12 /activerecord/test/cases
parent98d12f1ef31014287c897fc60df4e1af70781ca3 (diff)
downloadrails-5dafa72935fbb0656f814f26f94e46f545890214.tar.gz
rails-5dafa72935fbb0656f814f26f94e46f545890214.tar.bz2
rails-5dafa72935fbb0656f814f26f94e46f545890214.zip
Fix extracting `references` via `order_values` to respect quoting
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/relations_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 86f3b0b962..dc81f13fe9 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1717,6 +1717,9 @@ class RelationTest < ActiveRecord::TestCase
scope = Post.order("comments.body")
assert_equal ["comments"], scope.references_values
+ scope = Post.order("#{Comment.quoted_table_name}.#{Comment.quoted_primary_key}")
+ assert_equal ["comments"], scope.references_values
+
scope = Post.order("comments.body", "yaks.body")
assert_equal ["comments", "yaks"], scope.references_values
@@ -1735,6 +1738,9 @@ class RelationTest < ActiveRecord::TestCase
scope = Post.reorder("comments.body")
assert_equal %w(comments), scope.references_values
+ scope = Post.reorder("#{Comment.quoted_table_name}.#{Comment.quoted_primary_key}")
+ assert_equal ["comments"], scope.references_values
+
scope = Post.reorder("comments.body", "yaks.body")
assert_equal %w(comments yaks), scope.references_values