diff options
| author | Bogdan Gusiev <agresso@gmail.com> | 2014-05-05 10:48:59 +0300 |
|---|---|---|
| committer | Bogdan Gusiev <agresso@gmail.com> | 2014-05-05 16:45:16 +0300 |
| commit | 7e20bdc20dd91e1195086a5f54178a01b74ebb31 (patch) | |
| tree | 2cbd6950a407332e15006e009b3fd5de36b93ce9 /activerecord/lib | |
| parent | f2003834c85db173ea436273b63315543b82f896 (diff) | |
| download | rails-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/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb index 9c666dcd3b..50f4d5c7ab 100644 --- a/activerecord/lib/active_record/relation/delegation.rb +++ b/activerecord/lib/active_record/relation/delegation.rb @@ -43,7 +43,7 @@ module ActiveRecord :keep_if, :pop, :shift, :delete_at, :compact, :select! ].to_set # :nodoc: - delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, to: :to_a + delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, :join, to: :to_a delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key, :connection, :columns_hash, :to => :klass |