diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-04-11 21:03:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 21:03:11 -0400 |
| commit | 7622b85a300a1863ece44eb429ddabdadbee7f77 (patch) | |
| tree | dcdc8c7fd86e546015206e8b6a7da6679bfa5e70 /activerecord/lib | |
| parent | 733f3cbea8d81170a16425c46d194f3e51e1422e (diff) | |
| parent | 115bbdac2b8e11ec92241b839665c5811cc8a2fb (diff) | |
| download | rails-7622b85a300a1863ece44eb429ddabdadbee7f77.tar.gz rails-7622b85a300a1863ece44eb429ddabdadbee7f77.tar.bz2 rails-7622b85a300a1863ece44eb429ddabdadbee7f77.zip | |
Merge pull request #32536 from lsylvester/fix-immutable-relation-error-with-http-caching-and-collection-caching
Fix ActiveRecord::ImmutableRelation is raised when collection caching and HTTP caching are used together
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 38a364ff88..3c66d2f8be 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -8,8 +8,8 @@ module ActiveRecord :extending, :unscope] SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :reordering, - :reverse_order, :distinct, :create_with, :skip_query_cache, - :skip_preloading] + :reverse_order, :distinct, :create_with, :skip_query_cache] + CLAUSE_METHODS = [:where, :having, :from] INVALID_METHODS_FOR_DELETE_ALL = [:distinct, :group, :having] @@ -19,6 +19,7 @@ module ActiveRecord include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches, Explain, Delegation attr_reader :table, :klass, :loaded, :predicate_builder + attr_accessor :skip_preloading_value alias :model :klass alias :loaded? :loaded alias :locked? :lock_value |