diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-05-29 20:37:35 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2017-05-29 20:37:35 +0200 |
| commit | e1758b5e8c8d49fdf931b0b3f8009810880113a6 (patch) | |
| tree | 97181998af56fff415827af679253b1472aa0006 /activerecord/lib/active_record/relation/delegation.rb | |
| parent | 61413b592dbbd6d7adbcb16fb95f760b0656cd9b (diff) | |
| parent | e7a33a5ed74cc0987544396f0742110fa5a5e228 (diff) | |
| download | rails-e1758b5e8c8d49fdf931b0b3f8009810880113a6.tar.gz rails-e1758b5e8c8d49fdf931b0b3f8009810880113a6.tar.bz2 rails-e1758b5e8c8d49fdf931b0b3f8009810880113a6.zip | |
Merge branch 'master' into unlock-minitest
Diffstat (limited to 'activerecord/lib/active_record/relation/delegation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb index 257ae04ff4..4f739a0415 100644 --- a/activerecord/lib/active_record/relation/delegation.rb +++ b/activerecord/lib/active_record/relation/delegation.rb @@ -46,6 +46,8 @@ module ActiveRecord delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key, :connection, :columns_hash, to: :klass + delegate :ast, :locked, to: :arel + module ClassSpecificRelation # :nodoc: extend ActiveSupport::Concern |