diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-05 18:48:10 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-05 18:48:10 +0000 |
commit | 9d7e6432b22a11e96ad7a3cab7510fac7b3927d6 (patch) | |
tree | e2d4d84550401d00a6e0dbe0b38fc6ae475803f5 /activerecord/lib/active_record/associations/has_many_association.rb | |
parent | d48322ecca83765a47c054aa72a7165efe9a81f5 (diff) | |
download | rails-9d7e6432b22a11e96ad7a3cab7510fac7b3927d6.tar.gz rails-9d7e6432b22a11e96ad7a3cab7510fac7b3927d6.tar.bz2 rails-9d7e6432b22a11e96ad7a3cab7510fac7b3927d6.zip |
Deprecated ActiveRecord::Base.new_record? in favor of ActiveRecord::Base.new? (old version still works until Rails 2.0) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5017 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index d3fdcbe02f..d4c6bdcada 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -111,7 +111,7 @@ module ActiveRecord end def load_target - if !@owner.new_record? || foreign_key_present + if !@owner.new? || foreign_key_present begin if !loaded? if @target.is_a?(Array) && @target.any? @@ -184,7 +184,7 @@ module ActiveRecord when @reflection.options[:as] @finder_sql = "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + - "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}" + "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote @owner.class.base_class.name.to_s}" @finder_sql << " AND (#{conditions})" if conditions else |