Don't load test env by default
Pass a base relation to build_default_scope when joining

This allows the default scope to be built using the current table alias.
Resolves #12770
AR .persisted? throws SystemStackError for an unsaved model with a
custom primary_key that didn't save due to validation error
Merge pull request #14393 from chrisfinne/persisted_exception

AR .persisted? throws SystemStackError for an unsaved model with a
custom primary_key that didn't save due to validation error
Adds explanation of :base attribute to errors.add

[ci skip]
Merge pull request #14505 from davefp/patch-1

Adds explanation of :base attribute to errors.add [ci skip]
Merge pull request #14469 from tiegz/timestamp_inheritance_fix

Swap Timestamp/Callbacks order in ActiveRecord::Base
Merge pull request #14154 from al2o3cr/issue12770

Pass a base relation to build_default_scope when joining
PostgreSQL, test cases to lock the current column types.
Fix warning for overshadowing XML variable
Merge pull request #14515 from mzahir/fix_xml_warning

Fix warning for overshadowing XML variable
HashWithIndifferentAccess better respects #to_hash

In particular, `.new`, `#update`, `#merge`, `#replace` all accept
objects which respond to `#to_hash`, even if those objects are not
Hashes directly.
PostgreSQL, test-cases to lock down column default values.
PostgreSQL, use `PostgreSQLColumn` in PG specific tests.
Merge pull request #12778 from etehtsea/rake-default-fix

Don't load test env by default.

Closes #13241
Add CHANGELOG entry for #12778 [ci skip]
Merge pull request #12550 from Peeja/hash-wia-update-respects-to-hash

HashWithIndifferentAccess#update respects #to_hash
Call super first to minimize the noise
Merge branch 'master' into test_equality_operators_return_values