aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorBogdan Gusiev <agresso@gmail.com>2014-05-05 10:48:59 +0300
committerBogdan Gusiev <agresso@gmail.com>2014-05-05 16:45:16 +0300
commit7e20bdc20dd91e1195086a5f54178a01b74ebb31 (patch)
tree2cbd6950a407332e15006e009b3fd5de36b93ce9 /activerecord/test/cases
parentf2003834c85db173ea436273b63315543b82f896 (diff)
downloadrails-7e20bdc20dd91e1195086a5f54178a01b74ebb31.tar.gz
rails-7e20bdc20dd91e1195086a5f54178a01b74ebb31.tar.bz2
rails-7e20bdc20dd91e1195086a5f54178a01b74ebb31.zip
Put back Relation#join method as a delegate to Array
This is a regression 4.0 -> 4.1 fix. In 4.1.0 Relation#join is delegated to Arel#SelectManager. In 4.0 series it is delegated to Array#join This patch puts back the behaviour of 4.0
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/relation/delegation_test.rb2
-rw-r--r--activerecord/test/cases/relations_test.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb
index 9b2bfed039..29c9d0e2af 100644
--- a/activerecord/test/cases/relation/delegation_test.rb
+++ b/activerecord/test/cases/relation/delegation_test.rb
@@ -32,7 +32,7 @@ module ActiveRecord
:exclude?, :find_all, :flat_map, :group_by, :include?, :length,
:map, :none?, :one?, :partition, :reject, :reverse,
:sample, :second, :sort, :sort_by, :third,
- :to_ary, :to_set, :to_xml, :to_yaml
+ :to_ary, :to_set, :to_xml, :to_yaml, :join
]
ARRAY_DELEGATES.each do |method|
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 68e62934c1..6a880c6680 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1677,4 +1677,8 @@ class RelationTest < ActiveRecord::TestCase
merged = left.merge(right)
assert_equal post, merged.first
end
+
+ def test_relation_join_method
+ assert_equal 'Thank you for the welcome,Thank you again for the welcome', Post.first.comments.join(",")
+ end
end