aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-09-05 18:48:10 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-09-05 18:48:10 +0000
commit9d7e6432b22a11e96ad7a3cab7510fac7b3927d6 (patch)
treee2d4d84550401d00a6e0dbe0b38fc6ae475803f5 /activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
parentd48322ecca83765a47c054aa72a7165efe9a81f5 (diff)
downloadrails-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_and_belongs_to_many_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 8c0e50e38e..f10c5957f8 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -19,7 +19,7 @@ module ActiveRecord
attributes.collect { |attr| create(attr) }
else
record = build(attributes)
- insert_record(record) unless @owner.new_record?
+ insert_record(record) unless @owner.new?
record
end
end
@@ -75,7 +75,7 @@ module ActiveRecord
join_attributes.each { |key, value| record[key.to_s] = value }
callback(:before_add, record)
- insert_record(record) unless @owner.new_record?
+ insert_record(record) unless @owner.new?
@target << record
callback(:after_add, record)
@@ -101,7 +101,7 @@ module ActiveRecord
end
def insert_record(record)
- if record.new_record?
+ if record.new?
return false unless record.save
end
@@ -118,7 +118,7 @@ module ActiveRecord
attributes[column.name] = record.quoted_id
else
if record.attributes.has_key?(column.name)
- value = @owner.send(:quote_value, record[column.name], column)
+ value = @owner.send(:quote, record[column.name], column)
attributes[column.name] = value unless value.nil?
end
end