aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-16 21:03:29 +0200
committerGitHub <noreply@github.com>2017-07-16 21:03:29 +0200
commit919b55d9747f69c566616d740616d11ef2db8c58 (patch)
tree48039fb65268710d1b0586fefd7c8a8696448534 /activerecord/lib/active_record/relation.rb
parentc74820d516bdb731a3df3c94192a542abb6c393b (diff)
parentd476553d1cdeee0805585c2d4e2e6ee6be841288 (diff)
downloadrails-919b55d9747f69c566616d740616d11ef2db8c58.tar.gz
rails-919b55d9747f69c566616d740616d11ef2db8c58.tar.bz2
rails-919b55d9747f69c566616d740616d11ef2db8c58.zip
Merge pull request #29814 from kamipo/dont_cache_scope_for_create
Don't cache `scope_for_create`
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 23cb1baaed..c5d98e970a 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -556,7 +556,7 @@ module ActiveRecord
end
def reset
- @to_sql = @scope_for_create = @arel = @loaded = @should_eager_load = nil
+ @to_sql = @arel = @loaded = @should_eager_load = nil
@records = [].freeze
@offsets = {}
self
@@ -590,7 +590,7 @@ module ActiveRecord
end
def scope_for_create
- @scope_for_create ||= where_values_hash.merge!(create_with_value.stringify_keys)
+ where_values_hash.merge!(create_with_value.stringify_keys)
end
# Returns true if relation needs eager loading.