Permalink
Browse files

Merge pull request #6558 from parndt/fix_regression

Fix regression
  • Loading branch information...
1 parent fe4dfdd commit ac465d5dd2220acba26947ed3c6d29c11287e333 @tenderlove tenderlove committed May 31, 2012
Showing with 4 additions and 3 deletions.
  1. +4 −3 activerecord/lib/active_record/base.rb
@@ -450,12 +450,12 @@ def arel_engine
private
def relation #:nodoc:
- relation ||= Relation.new(self, arel_table)
+ @relation ||= Relation.new(self, arel_table)
if finder_needs_type_condition?
- relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
+ @relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
else
- relation
+ @relation
end
end
end
@@ -489,6 +489,7 @@ def initialize(attributes = nil, options = {})
@marked_for_destruction = false
@previously_changed = {}
@changed_attributes = {}
+ @relation = nil
ensure_proper_type

0 comments on commit ac465d5

Please sign in to comment.