Conflicts: activerecord/lib/active_record/attribute_methods/primary_key.rb activerecord/test/cases/primary_keys_test.rb
Conflicts: activerecord/lib/active_record/associations/builder/has_many.rb activerecord/lib/active_record/associations/has_many_association.rb
…urn nil. Conflicts: activerecord/test/cases/attribute_methods_test.rb
If we're deleting all records in an association, don't add a IN(..) clause to the query. Fixes #3672.
adapters. These tests fail on the v3.1.2 tag. Closes #3690. Conflicts: activerecord/CHANGELOG.md
Use the schema_search_path in prepared statements in postgres. Only the tests are backported, the fix was already included by commit 818d285.
… mysql/mysql2 (fix #3440)
Reasons: * Markdown reads well as plain text, but can also be formatted. * It will make it easier for people to read on the web as Github formats the Markdown nicely. * It will encourage a level of consistency when people are writing CHANGELOG entries. The script used to perform the conversion is at https://gist.github.com/1339263