Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git@github.com:rails/rails

  • Loading branch information...
commit f46fd6f2fceb22f00669f066fc98f92a18e5875f 2 parents 4b17082 + 2e74177
@jeremy jeremy authored
View
2  activerecord/CHANGELOG
@@ -2,8 +2,6 @@
* Change validates_uniqueness_of :case_sensitive option default back to true (from [9160]). Love your database columns, don't LOWER them. [rick]
-* Ensure that save on child object fails for invalid belongs_to association. Closes #11555. [rubyruy]
-
* Add support for interleaving migrations by storing which migrations have run in the new schema_migrations table. Closes #11493 [jordi]
* ActiveRecord::Base#sum defaults to 0 if no rows are returned. Closes #11550 [kamal]
View
2  activerecord/lib/active_record/associations.rb
@@ -922,8 +922,6 @@ def belongs_to(association_id, options = {})
)
end
- add_single_associated_save_callbacks(reflection.name)
-
configure_dependency_for_belongs_to(reflection)
end
View
12 activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -377,16 +377,4 @@ def test_cant_save_readonly_association
assert companies(:first_client).readonly_firm.readonly?
end
- def test_save_fails_for_invalid_belongs_to
- log = AuditLog.new
- assert log.valid?
-
- log.build_developer # Build invalid association
- assert !log.developer.valid?
- assert !log.valid?
- assert_equal "is invalid", log.errors.on("developer")
-
- assert !log.save
- end
-
end
Please sign in to comment.
Something went wrong with that request. Please try again.