diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-05-28 23:35:50 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-28 23:35:50 +0930 |
| commit | aa3f4036c144ba2ab46d0ebac7a41bf18c8b6f47 (patch) | |
| tree | 4c8f662cd322a9311987e14d984b4f29abd7cbc3 /activerecord/lib/active_record | |
| parent | 352865d0f835c24daa9a2e9863dcc9dde9e5371a (diff) | |
| parent | 2ee96632b640da0d09b164ed67b1a9f6b96594b3 (diff) | |
| download | rails-aa3f4036c144ba2ab46d0ebac7a41bf18c8b6f47.tar.gz rails-aa3f4036c144ba2ab46d0ebac7a41bf18c8b6f47.tar.bz2 rails-aa3f4036c144ba2ab46d0ebac7a41bf18c8b6f47.zip | |
Merge pull request #29003 from kamipo/delegate_ast_and_locked_to_arel_explicitly
Delegate `ast` and `locked` to `arel` explicitly
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 86b77a7cec..7a8f9abb36 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -18,6 +18,7 @@ module ActiveRecord attr_reader :table, :klass, :loaded, :predicate_builder alias :model :klass alias :loaded? :loaded + alias :locked? :locked def initialize(klass, table, predicate_builder, values = {}) @klass = klass 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 |