diff options
author | Tobias Lütke <tobias.luetke@gmail.com> | 2006-12-06 00:13:31 +0000 |
---|---|---|
committer | Tobias Lütke <tobias.luetke@gmail.com> | 2006-12-06 00:13:31 +0000 |
commit | cdad2d41e18977dd66518efddcb83c2107f0e057 (patch) | |
tree | bc7b29ec491f534cd2ca91385658d404e3382452 /activerecord/lib/active_record | |
parent | 8dea60b0c3a965c169127e0f1f4777bfbbc5e16d (diff) | |
download | rails-cdad2d41e18977dd66518efddcb83c2107f0e057.tar.gz rails-cdad2d41e18977dd66518efddcb83c2107f0e057.tar.bz2 rails-cdad2d41e18977dd66518efddcb83c2107f0e057.zip |
Consolidated different create and create! versions to call through to the base class with scope. This fixes inconsistencies, especially related to protected attribtues.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5684 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
3 files changed, 44 insertions, 24 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 66b4079f55..80b7658a95 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -84,13 +84,19 @@ module ActiveRecord reset_target! end - - def create(attributes = {}) - build_and_save_with(attributes, :save) + + def create(attrs = {}) + record = @reflection.klass.with_scope(construct_scope) { @reflection.klass.create(attrs) } + @target ||= [] unless loaded? + @target << record + record end - def create!(attributes = {}) - build_and_save_with(attributes, :save!) + def create!(attrs = {}) + record = @reflection.klass.with_scope(construct_scope) { @reflection.klass.create!(attrs) } + @target ||= [] unless loaded? + @target << record + record end # Returns the size of the collection by executing a SELECT COUNT(*) query if the collection hasn't been loaded and @@ -201,18 +207,7 @@ module ActiveRecord def callbacks_for(callback_name) full_callback_name = "#{callback_name}_for_#{@reflection.name}" @owner.class.read_inheritable_attribute(full_callback_name.to_sym) || [] - end - - def build_and_save_with(attributes, method) - # Can't use Base.create since the foreign key may be a protected attribute. - if attributes.is_a?(Array) - attributes.collect { |attr| create(attr) } - else - record = build(attributes) - record.send(method) unless @owner.new_record? - record - end - end + end end end end diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 4ccd725ebd..9beddb2ac9 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -6,9 +6,29 @@ module ActiveRecord construct_sql end - def create(attributes = {}, replace_existing = true) - record = build(attributes, replace_existing) - record.save + def create(attrs = {}, replace_existing = true) + record = @reflection.klass.with_scope(construct_scope) { @reflection.klass.create(attrs) } + + if replace_existing + replace(record, true) + else + record[@reflection.primary_key_name] = @owner.id unless @owner.new_record? + self.target = record + end + + record + end + + def create!(attrs = {}, replace_existing = true) + record = @reflection.klass.with_scope(construct_scope) { @reflection.klass.create!(attrs) } + + if replace_existing + replace(record, true) + else + record[@reflection.primary_key_name] = @owner.id unless @owner.new_record? + self.target = record + end + record end @@ -75,6 +95,13 @@ module ActiveRecord end @finder_sql << " AND (#{conditions})" if conditions end + + def construct_scope + create_scoping = {} + set_belongs_to_association_for(create_scoping) + { :create => create_scoping } + end + end end end diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index 3bc0e8fa37..342a4844cc 100755 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -717,12 +717,10 @@ module ActiveRecord # so an exception is raised if the record is invalid. def create!(attributes = nil) if attributes.is_a?(Array) - attributes.collect { |attr| create!(attr) } + attributes.collect { |attr| create(attr) } else - attributes ||= {} - attributes.reverse_merge!(scope(:create)) if scoped?(:create) - object = new(attributes) + scope(:create).each { |att,value| object.send("#{att}=", value) } if scoped?(:create) object.save! object end |