activerecord/test/fixtures/juliet.yml activerecord/test/fixtures/romeo.yml activerecord/test/models/circular_belonging.rb @@ -936,7 +936,9 @@ module ActiveRecord "#{reflection.class_name}.send(:attr_readonly,\"#{cache_column}\".intern) if defined?(#{reflection.class_name}) && #{reflection.class_name}.respond_to?(:attr_readonly)" ) end - + + add_single_associated_save_callbacks(reflection.name) + configure_dependency_for_belongs_to(reflection) end activerecord/lib/active_record/associations.rb @@ -1,6 +1,7 @@ require "cases/helper" require 'models/developer' require 'models/project' +require 'models/circular_belonging' require 'models/company' require 'models/topic' require 'models/reply' @@ -383,6 +384,31 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase assert_raise(ActiveRecord::ReadOnlyRecord) { companies(:first_client).readonly_firm.save! } assert companies(:first_client).readonly_firm.readonly? end + + def test_save_fails_for_invalid_belongs_to + assert log = AuditLog.create(:developer_id=>0,:message=>"") + + log.developer = Developer.new + + assert !log.developer.valid? + assert !log.valid? + assert !log.save + assert_equal "is invalid", log.errors.on("developer") + end + + # This is supposed to test against the problem described here: + # http://groups.google.com/group/rubyonrails-core/browse_thread/thread/652d0d7e6d455c08 + # (which reverted this patch the first time) + # However, I cannot reproduce the problem. Perhaps changes in the core + # have made it go away? + def test_circular_save_for_belongs_to + assert romeo = Romeo.create(:montague=>true) + romeo.juliet = Juliet.new + + assert !romeo.valid? + assert !romeo.save + assert_equal "is invalid", romeo.errors.on("juliet") + end def test_polymorphic_assignment_foreign_type_field_updating # should update when assigning a saved record activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -166,6 +166,10 @@ ActiveRecord::Schema.define do create_table :jobs, :force => true do |t| t.integer :ideal_reference_id end + + create_table :juliets, :force => true do |t| + t.integer :romeo_id + end create_table :keyboards, :force => true, :id => false do |t| t.primary_key :key_number @@ -321,6 +325,10 @@ ActiveRecord::Schema.define do t.integer :post_id, :null => false t.integer :person_id, :null => false end + + create_table :romeos, :force => true do |t| + t.integer :juliet_id + end create_table :shape_expressions, :force => true do |t| t.string :paint_type activerecord/test/schema/schema.rb ed0cb91a830f317e3a8192a90294c1005f6156c2 Ruy Asan ruyasan@gmail.com http://github.com/rubyruy/rails/commit/f4cd52798b2cc1e4bf952b38712180e64cc91d51 f4cd52798b2cc1e4bf952b38712180e64cc91d51 2008-06-05T14:30:27-07:00 2008-06-05T14:30:27-07:00 Ensure that save on child object fails for invalid belongs_to association. TAKE TWO! - now with more unit tests! (which pass anyway for some reason!) 1736c8d2f9ca6db027081b0ee7a39366830c20e3 Ruy Asan ruyasan@gmail.com