activerecord 6.0.0 → 6.1.7.4

data/CHANGELOG.md

@@ -1,1013 +1,1812 @@
-## Rails 6.0.0 (August 16, 2019) ##
+## Rails 6.1.7.4 (June 26, 2023) ##
 
-*   Preserve user supplied joins order as much as possible.
-
-    Fixes #36761, #34328, #24281, #12953.
-
-    *Ryuta Kamizono*
+*   No changes.
 
-*   Make the DATABASE_URL env variable only affect the primary connection. Add new env variables for multiple databases.
 
-    *John Crepezzi*, *Eileen Uchitelle*
+## Rails 6.1.7.3 (March 13, 2023) ##
 
-*   Add a warning for enum elements with 'not_' prefix.
+*   No changes.
 
-        class Foo
-          enum status: [:sent, :not_sent]
-        end
 
-    *Edu Depetris*
+## Rails 6.1.7.2 (January 24, 2023) ##
 
-*   Make currency symbols optional for money column type in PostgreSQL
+*   No changes.
 
-    *Joel Schneider*
 
+## Rails 6.1.7.1 (January 17, 2023) ##
 
-## Rails 6.0.0.rc2 (July 22, 2019) ##
+*   Make sanitize_as_sql_comment more strict
 
-*   Add database_exists? method to connection adapters to check if a database exists.
+    Though this method was likely never meant to take user input, it was
+    attempting sanitization. That sanitization could be bypassed with
+    carefully crafted input.
 
-    *Guilherme Mansur*
+    This commit makes the sanitization more robust by replacing any
+    occurrances of "/*" or "*/" with "/ *" or "* /". It also performs a
+    first pass to remove one surrounding comment to avoid compatibility
+    issues for users relying on the existing removal.
 
-*   PostgreSQL: Fix GROUP BY with ORDER BY virtual count attribute.
+    This also clarifies in the documentation of annotate that it should not
+    be provided user input.
 
-    Fixes #36022.
+    [CVE-2023-22794]
 
-    *Ryuta Kamizono*
+*   Added integer width check to PostgreSQL::Quoting
 
-*   Make ActiveRecord `ConnectionPool.connections` method thread-safe.
+    Given a value outside the range for a 64bit signed integer type
+    PostgreSQL will treat the column type as numeric. Comparing
+    integer values against numeric values can result in a slow
+    sequential scan.
 
-    Fixes #36465.
+    This behavior is configurable via
+    ActiveRecord::Base.raise_int_wider_than_64bit which defaults to true.
 
-    *Jeff Doering*
+    [CVE-2022-44566]
 
-*   Fix sqlite3 collation parsing when using decimal columns.
+## Rails 6.1.7 (September 09, 2022) ##
 
-    *Martin R. Schuster*
+*   Symbol is allowed by default for YAML columns
 
-*   Fix invalid schema when primary key column has a comment.
+    *Étienne Barrié*
 
-    Fixes #29966.
+*   Fix `ActiveRecord::Store` to serialize as a regular Hash
 
-    *Guilherme Goettems Schneider*
+    Previously it would serialize as an `ActiveSupport::HashWithIndifferentAccess`
+    which is wasteful and cause problem with YAML safe_load.
 
-*   Fix table comment also being applied to the primary key column.
+    *Jean Boussier*
 
-    *Guilherme Goettems Schneider*
+*   Fix PG.connect keyword arguments deprecation warning on ruby 2.7
 
-*   Fix merging left_joins to maintain its own `join_type` context.
+    Fixes #44307.
 
-    Fixes #36103.
+    *Nikita Vasilevsky*
 
-    *Ryuta Kamizono*
+## Rails 6.1.6.1 (July 12, 2022) ##
 
+*   Change ActiveRecord::Coders::YAMLColumn default to safe_load
 
-## Rails 6.0.0.rc1 (April 24, 2019) ##
+    This adds two new configuration options The configuration options are as
+    follows:
+    
+    * `config.active_storage.use_yaml_unsafe_load`
+    
+    When set to true, this configuration option tells Rails to use the old
+    "unsafe" YAML loading strategy, maintaining the existing behavior but leaving
+    the possible escalation vulnerability in place.  Setting this option to true
+    is *not* recommended, but can aid in upgrading.
+    
+    * `config.active_record.yaml_column_permitted_classes`
+    
+    The "safe YAML" loading method does not allow all classes to be deserialized
+    by default.  This option allows you to specify classes deemed "safe" in your
+    application.  For example, if your application uses Symbol and Time in
+    serialized data, you can add Symbol and Time to the allowed list as follows:
+    
+    ```
+    config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time]
+    ```
 
-*   Add `touch` option to `has_one` association.
+    [CVE-2022-32224]
 
-    *Abhay Nikam*
 
-*   Deprecate `where.not` working as NOR and will be changed to NAND in Rails 6.1.
+## Rails 6.1.6 (May 09, 2022) ##
 
-    ```ruby
-    all = [treasures(:diamond), treasures(:sapphire), cars(:honda), treasures(:sapphire)]
-    assert_equal all, PriceEstimate.all.map(&:estimate_of)
-    ```
+*   No changes.
 
-    In Rails 6.0:
 
-    ```ruby
-    sapphire = treasures(:sapphire)
+## Rails 6.1.5.1 (April 26, 2022) ##
 
-    nor = all.reject { |e|
-      e.estimate_of_type == sapphire.class.polymorphic_name
-    }.reject { |e|
-      e.estimate_of_id == sapphire.id
-    }
-    assert_equal [cars(:honda)], nor
+*   No changes.
 
-    without_sapphire = PriceEstimate.where.not(
-      estimate_of_type: sapphire.class.polymorphic_name, estimate_of_id: sapphire.id
-    )
-    assert_equal nor, without_sapphire.map(&:estimate_of)
-    ```
 
-    In Rails 6.1:
+## Rails 6.1.5 (March 09, 2022) ##
 
-    ```ruby
-    sapphire = treasures(:sapphire)
+*   Fix `ActiveRecord::ConnectionAdapters::SchemaCache#deep_deduplicate` for Ruby 2.6.
 
-    nand = all - [sapphire]
-    assert_equal [treasures(:diamond), cars(:honda)], nand
+    Ruby 2.6 and 2.7 have slightly different implementations of the `String#-@` method.
+    In Ruby 2.6, the receiver of the `String#-@` method is modified under certain circumstances.
+    This was later identified as a bug (https://bugs.ruby-lang.org/issues/15926) and only
+    fixed in Ruby 2.7.
 
-    without_sapphire = PriceEstimate.where.not(
-      estimate_of_type: sapphire.class.polymorphic_name, estimate_of_id: sapphire.id
-    )
-    assert_equal nand, without_sapphire.map(&:estimate_of)
-    ```
+    Before the changes in this commit, the
+    `ActiveRecord::ConnectionAdapters::SchemaCache#deep_deduplicate` method, which internally
+    calls the `String#-@` method, could also modify an input string argument in Ruby 2.6 --
+    changing a tainted, unfrozen string into a tainted, frozen string.
 
-    *Ryuta Kamizono*
+    Fixes #43056
 
-*   Fix dirty tracking after rollback.
+    *Eric O'Hanlon*
 
-    Fixes #15018, #30167, #33868.
+*   Fix migration compatibility to create SQLite references/belongs_to column as integer when
+    migration version is 6.0.
 
-    *Ryuta Kamizono*
+    `reference`/`belongs_to` in migrations with version 6.0 were creating columns as
+    bigint instead of integer for the SQLite Adapter.
 
-*   Add `ActiveRecord::Relation#cache_version` to support recyclable cache keys via
-    the versioned entries in `ActiveSupport::Cache`. This also means that
-    `ActiveRecord::Relation#cache_key` will now return a stable key that does not
-    include the max timestamp or count any more.
+    *Marcelo Lauxen*
 
-    NOTE: This feature is turned off by default, and `cache_key` will still return
-    cache keys with timestamps until you set `ActiveRecord::Base.collection_cache_versioning = true`.
-    That's the setting for all new apps on Rails 6.0+
+*   Fix dbconsole for 3-tier config.
 
-    *Lachlan Sylvester*
+    *Eileen M. Uchitelle*
 
-*   Fix dirty tracking for `touch` to track saved changes.
+*   Better handle SQL queries with invalid encoding.
 
-    Fixes #33429.
+    ```ruby
+    Post.create(name: "broken \xC8 UTF-8")
+    ```
 
-    *Ryuta Kamzono*
+    Would cause all adapters to fail in a non controlled way in the code
+    responsible to detect write queries.
 
-*   `change_column_comment` and `change_table_comment` are invertible only if
-    `to` and `from` options are specified.
+    The query is now properly passed to the database connection, which might or might
+    not be able to handle it, but will either succeed or failed in a more correct way.
 
-    *Yoshiyuki Kinjo*
+    *Jean Boussier*
 
-*   Don't call commit/rollback callbacks when a record isn't saved.
+*   Ignore persisted in-memory records when merging target lists.
 
-    Fixes #29747.
+    *Kevin Sjöberg*
 
-    *Ryuta Kamizono*
+*   Fix regression bug that caused ignoring additional conditions for preloading
+    `has_many` through relations.
 
-*   Fix circular `autosave: true` causes invalid records to be saved.
+    Fixes #43132
 
-    Prior to the fix, when there was a circular series of `autosave: true`
-    associations, the callback for a `has_many` association was run while
-    another instance of the same callback on the same association hadn't
-    finished running. When control returned to the first instance of the
-    callback, the instance variable had changed, and subsequent associated
-    records weren't saved correctly. Specifically, the ID field for the
-    `belongs_to` corresponding to the `has_many` was `nil`.
+    *Alexander Pauly*
 
-    Fixes #28080.
+*   Fix `ActiveRecord::InternalMetadata` to not be broken by
+    `config.active_record.record_timestamps = false`
 
-    *Larry Reid*
+    Since the model always create the timestamp columns, it has to set them, otherwise it breaks
+    various DB management tasks.
 
-*   Raise `ArgumentError` for invalid `:limit` and `:precision` like as other options.
+    Fixes #42983
 
-    Before:
+    *Jean Boussier*
 
-    ```ruby
-    add_column :items, :attr1, :binary,   size: 10      # => ArgumentError
-    add_column :items, :attr2, :decimal,  scale: 10     # => ArgumentError
-    add_column :items, :attr3, :integer,  limit: 10     # => ActiveRecordError
-    add_column :items, :attr4, :datetime, precision: 10 # => ActiveRecordError
-    ```
+*   Fix duplicate active record objects on `inverse_of`.
 
-    After:
+    *Justin Carvalho*
 
-    ```ruby
-    add_column :items, :attr1, :binary,   size: 10      # => ArgumentError
-    add_column :items, :attr2, :decimal,  scale: 10     # => ArgumentError
-    add_column :items, :attr3, :integer,  limit: 10     # => ArgumentError
-    add_column :items, :attr4, :datetime, precision: 10 # => ArgumentError
-    ```
+*   Fix duplicate objects stored in has many association after save.
 
-    *Ryuta Kamizono*
+    Fixes #42549.
 
-*   Association loading isn't to be affected by scoping consistently
-    whether preloaded / eager loaded or not, with the exception of `unscoped`.
+    *Alex Ghiculescu*
 
-    Before:
+*   Fix performance regression in `CollectionAssocation#build`.
 
-    ```ruby
-    Post.where("1=0").scoping do
-      Comment.find(1).post                   # => nil
-      Comment.preload(:post).find(1).post    # => #<Post id: 1, ...>
-      Comment.eager_load(:post).find(1).post # => #<Post id: 1, ...>
-    end
-    ```
+    *Alex Ghiculescu*
 
-    After:
+*   Fix retrieving default value for text column for MariaDB.
 
-    ```ruby
-    Post.where("1=0").scoping do
-      Comment.find(1).post                   # => #<Post id: 1, ...>
-      Comment.preload(:post).find(1).post    # => #<Post id: 1, ...>
-      Comment.eager_load(:post).find(1).post # => #<Post id: 1, ...>
-    end
-    ```
+    *fatkodima*
 
-    Fixes #34638, #35398.
 
-    *Ryuta Kamizono*
+## Rails 6.1.4.7 (March 08, 2022) ##
 
-*   Add `rails db:prepare` to migrate or setup a database.
+*   No changes.
 
-    Runs `db:migrate` if the database exists or `db:setup` if it doesn't.
 
-    *Roberto Miranda*
+## Rails 6.1.4.6 (February 11, 2022) ##
 
-*   Add `after_save_commit` callback as shortcut for `after_commit :hook, on: [ :create, :update ]`.
+*   No changes.
 
-    *DHH*
 
-*   Assign all attributes before calling `build` to ensure the child record is visible in
-    `before_add` and `after_add` callbacks for `has_many :through` associations.
+## Rails 6.1.4.5 (February 11, 2022) ##
 
-    Fixes #33249.
+*   No changes.
 
-    *Ryan H. Kerr*
 
-*   Add `ActiveRecord::Relation#extract_associated` for extracting associated records from a relation.
+## Rails 6.1.4.4 (December 15, 2021) ##
 
-    ```
-    account.memberships.extract_associated(:user)
-    # => Returns collection of User records
-    ```
+*   No changes.
 
-    *DHH*
 
-*   Add `ActiveRecord::Relation#annotate` for adding SQL comments to its queries.
+## Rails 6.1.4.3 (December 14, 2021) ##
 
-    For example:
+*   No changes.
 
-    ```
-    Post.where(id: 123).annotate("this is a comment").to_sql
-    # SELECT "posts".* FROM "posts" WHERE "posts"."id" = 123 /* this is a comment */
-    ```
 
-    This can be useful in instrumentation or other analysis of issued queries.
+## Rails 6.1.4.2 (December 14, 2021) ##
 
-    *Matt Yoho*
+*   No changes.
 
-*   Support Optimizer Hints.
 
-    In most databases, a way to control the optimizer is by using optimizer hints,
-    which can be specified within individual statements.
+## Rails 6.1.4.1 (August 19, 2021) ##
 
-    Example (for MySQL):
+*   No changes.
 
-        Topic.optimizer_hints("MAX_EXECUTION_TIME(50000)", "NO_INDEX_MERGE(topics)")
-        # SELECT /*+ MAX_EXECUTION_TIME(50000) NO_INDEX_MERGE(topics) */ `topics`.* FROM `topics`
 
-    Example (for PostgreSQL with pg_hint_plan):
+## Rails 6.1.4 (June 24, 2021) ##
 
-        Topic.optimizer_hints("SeqScan(topics)", "Parallel(topics 8)")
-        # SELECT /*+ SeqScan(topics) Parallel(topics 8) */ "topics".* FROM "topics"
+*   Do not try to rollback transactions that failed due to a `ActiveRecord::TransactionRollbackError`.
 
-    See also:
+    *Jamie McCarthy*
 
-    * https://dev.mysql.com/doc/refman/8.0/en/optimizer-hints.html
-    * https://pghintplan.osdn.jp/pg_hint_plan.html
-    * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/tgsql/influencing-the-optimizer.html
-    * https://docs.microsoft.com/en-us/sql/t-sql/queries/hints-transact-sql-query?view=sql-server-2017
-    * https://www.ibm.com/support/knowledgecenter/en/SSEPGG_11.1.0/com.ibm.db2.luw.admin.perf.doc/doc/c0070117.html
+*   Raise an error if `pool_config` is `nil` in `set_pool_config`.
 
-    *Ryuta Kamizono*
+    *Eileen M. Uchitelle*
 
-*   Fix query attribute method on user-defined attribute to be aware of typecasted value.
+*   Fix compatibility with `psych >= 4`.
 
-    For example, the following code no longer return false as casted non-empty string:
+    Starting in Psych 4.0.0 `YAML.load` behaves like `YAML.safe_load`. To preserve compatibility
+    Active Record's schema cache loader and `YAMLColumn` now uses `YAML.unsafe_load` if available.
 
-    ```
-    class Post < ActiveRecord::Base
-      attribute :user_defined_text, :text
-    end
+    *Jean Boussier*
 
-    Post.new(user_defined_text: "false").user_defined_text? # => true
-    ```
+*   Support using replicas when using `rails dbconsole`.
 
-    *Yuji Kamijima*
+    *Christopher Thornton*
 
-*   Quote empty ranges like other empty enumerables.
+*   Restore connection pools after transactional tests.
 
-    *Patrick Rebsch*
+    *Eugene Kenny*
 
-*   Add `insert_all`/`insert_all!`/`upsert_all` methods to `ActiveRecord::Persistence`,
-    allowing bulk inserts akin to the bulk updates provided by `update_all` and
-    bulk deletes by `delete_all`.
+*   Change `upsert_all` to fails cleanly for MySQL when `:unique_by` is used.
 
-    Supports skipping or upserting duplicates through the `ON CONFLICT` syntax
-    for PostgreSQL (9.5+) and SQLite (3.24+) and `ON DUPLICATE KEY UPDATE` syntax
-    for MySQL.
+    *Bastian Bartmann*
 
-    *Bob Lail*
+*   Fix user-defined `self.default_scope` to respect table alias.
 
-*   Add `rails db:seed:replant` that truncates tables of each database
-    for current environment and loads the seeds.
+    *Ryuta Kamizono*
 
-    *bogdanvlviv*, *DHH*
+*   Clear `@cache_keys` cache after `update_all`, `delete_all`, `destroy_all`.
 
-*   Add `ActiveRecord::Base.connection.truncate` for SQLite3 adapter.
+    *Ryuta Kamizono*
 
-    *bogdanvlviv*
+*   Changed Arel predications `contains` and `overlaps` to use
+    `quoted_node` so that PostgreSQL arrays are quoted properly.
 
-*   Deprecate mismatched collation comparison for uniqueness validator.
+    *Bradley Priest*
 
-    Uniqueness validator will no longer enforce case sensitive comparison in Rails 6.1.
-    To continue case sensitive comparison on the case insensitive column,
-    pass `case_sensitive: true` option explicitly to the uniqueness validator.
+*   Fix `merge` when the `where` clauses have string contents.
 
     *Ryuta Kamizono*
 
-*   Add `reselect` method. This is a short-hand for `unscope(:select).select(fields)`.
+*   Fix rollback of parent destruction with nested `dependent: :destroy`.
 
-    Fixes #27340.
+    *Jacopo Beschi*
 
-    *Willian Gustavo Veiga*
+*   Fix binds logging for `"WHERE ... IN ..."` statements.
 
-*   Add negative scopes for all enum values.
+    *Ricardo Díaz*
 
-    Example:
+*   Handle `false` in relation strict loading checks.
 
-        class Post < ActiveRecord::Base
-          enum status: %i[ drafted active trashed ]
-        end
+    Previously when a model had strict loading set to true and then had a
+    relation set `strict_loading` to false the false wasn't considered when
+    deciding whether to raise/warn about strict loading.
 
-        Post.not_drafted # => where.not(status: :drafted)
-        Post.not_active  # => where.not(status: :active)
-        Post.not_trashed # => where.not(status: :trashed)
+    ```
+    class Dog < ActiveRecord::Base
+      self.strict_loading_by_default = true
 
-    *DHH*
+      has_many :treats, strict_loading: false
+    end
+    ```
 
-*   Fix different `count` calculation when using `size` with manual `select` with DISTINCT.
+    In the example, `dog.treats` would still raise even though
+    `strict_loading` was set to false. This is a bug affecting more than
+    Active Storage which is why I made this PR superseding #41461. We need
+    to fix this for all applications since the behavior is a little
+    surprising. I took the test from #41461 and the code suggestion from #41453
+    with some additions.
 
-    Fixes #35214.
+    *Eileen M. Uchitelle*, *Radamés Roriz*
 
-    *Juani Villarejo*
+*   Fix numericality validator without precision.
 
+    *Ryuta Kamizono*
 
-## Rails 6.0.0.beta3 (March 11, 2019) ##
+*   Fix aggregate attribute on Enum types.
 
-*   No changes.
+    *Ryuta Kamizono*
 
+*   Fix `CREATE INDEX` statement generation for PostgreSQL.
 
-## Rails 6.0.0.beta2 (February 25, 2019) ##
+    *eltongo*
 
-*   Fix prepared statements caching to be enabled even when query caching is enabled.
+*   Fix where clause on enum attribute when providing array of strings.
 
     *Ryuta Kamizono*
 
-*   Ensure `update_all` series cares about optimistic locking.
+*   Fix `unprepared_statement` to work it when nesting.
 
     *Ryuta Kamizono*
 
-*   Don't allow `where` with non numeric string matches to 0 values.
-
-    *Ryuta Kamizono*
 
-*   Introduce `ActiveRecord::Relation#destroy_by` and `ActiveRecord::Relation#delete_by`.
+## Rails 6.1.3.2 (May 05, 2021) ##
 
-    `destroy_by` allows relation to find all the records matching the condition and perform
-    `destroy_all` on the matched records.
+*   No changes.
 
-    Example:
 
-        Person.destroy_by(name: 'David')
-        Person.destroy_by(name: 'David', rating: 4)
+## Rails 6.1.3.1 (March 26, 2021) ##
 
-        david = Person.find_by(name: 'David')
-        david.posts.destroy_by(id: [1, 2, 3])
+*   No changes.
 
-    `delete_by` allows relation to find all the records matching the condition and perform
-    `delete_all` on the matched records.
 
-    Example:
+## Rails 6.1.3 (February 17, 2021) ##
 
-        Person.delete_by(name: 'David')
-        Person.delete_by(name: 'David', rating: 4)
+*   Fix the MySQL adapter to always set the right collation and charset
+    to the connection session.
 
-        david = Person.find_by(name: 'David')
-        david.posts.delete_by(id: [1, 2, 3])
+    *Rafael Mendonça França*
 
-    *Abhay Nikam*
+*   Fix MySQL adapter handling of time objects when prepared statements
+    are enabled.
 
-*   Don't allow `where` with invalid value matches to nil values.
+    *Rafael Mendonça França*
 
-    Fixes #33624.
+*   Fix scoping in enum fields using conditions that would generate
+    an `IN` clause.
 
     *Ryuta Kamizono*
 
-*   SQLite3: Implement `add_foreign_key` and `remove_foreign_key`.
+*   Skip optimised #exist? query when #include? is called on a relation
+    with a having clause
 
-    *Ryuta Kamizono*
+    Relations that have aliased select values AND a having clause that
+    references an aliased select value would generate an error when
+    #include? was called, due to an optimisation that would generate
+    call #exists? on the relation instead, which effectively alters
+    the select values of the query (and thus removes the aliased select
+    values), but leaves the having clause intact. Because the having
+    clause is then referencing an aliased column that is no longer
+    present in the simplified query, an ActiveRecord::InvalidStatement
+    error was raised.
 
-*   Deprecate using class level querying methods if the receiver scope
-    regarded as leaked. Use `klass.unscoped` to avoid the leaking scope.
+    An sample query affected by this problem:
 
-    *Ryuta Kamizono*
+    ```ruby
+    Author.select('COUNT(*) as total_posts', 'authors.*')
+          .joins(:posts)
+          .group(:id)
+          .having('total_posts > 2')
+          .include?(Author.first)
+    ```
 
-*   Allow applications to automatically switch connections.
+    This change adds an addition check to the condition that skips the
+    simplified #exists? query, which simply checks for the presence of
+    a having clause.
 
-    Adds a middleware and configuration options that can be used in your
-    application to automatically switch between the writing and reading
-    database connections.
+    Fixes #41417
 
-    `GET` and `HEAD` requests will read from the replica unless there was
-    a write in the last 2 seconds, otherwise they will read from the primary.
-    Non-get requests will always write to the primary. The middleware accepts
-    an argument for a Resolver class and an Operations class where you are able
-    to change how the auto-switcher works to be most beneficial for your
-    application.
+    *Michael Smart*
 
-    To use the middleware in your application you can use the following
-    configuration options:
+*   Increment postgres prepared statement counter before making a prepared statement, so if the statement is aborted
+    without Rails knowledge (e.g., if app gets kill -9d during long-running query or due to Rack::Timeout), app won't end
+    up in perpetual crash state for being inconsistent with Postgres.
 
-    ```
-    config.active_record.database_selector = { delay: 2.seconds }
-    config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
-    config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
-    ```
+    *wbharding*, *Martin Tepper*
 
-    To change the database selection strategy, pass a custom class to the
-    configuration options:
 
-    ```
-    config.active_record.database_selector = { delay: 10.seconds }
-    config.active_record.database_resolver = MyResolver
-    config.active_record.database_resolver_context = MyResolver::MyCookies
-    ```
+## Rails 6.1.2.1 (February 10, 2021) ##
 
-    *Eileen M. Uchitelle*
+*   Fix possible DoS vector in PostgreSQL money type
 
-*   MySQL: Support `:size` option to change text and blob size.
+    Carefully crafted input can cause a DoS via the regular expressions used
+    for validating the money format in the PostgreSQL adapter.  This patch
+    fixes the regexp.
 
-    *Ryuta Kamizono*
+    Thanks to @dee-see from Hackerone for this patch!
 
-*   Make `t.timestamps` with precision by default.
+    [CVE-2021-22880]
 
-    *Ryuta Kamizono*
+    *Aaron Patterson*
 
 
-## Rails 6.0.0.beta1 (January 18, 2019) ##
+## Rails 6.1.2 (February 09, 2021) ##
 
-*   Remove deprecated `#set_state` from the transaction object.
+*   Fix timestamp type for sqlite3.
 
-    *Rafael Mendonça França*
+    *Eileen M. Uchitelle*
 
-*   Remove deprecated `#supports_statement_cache?` from the database adapters.
+*   Make destroy async transactional.
 
-    *Rafael Mendonça França*
+    An active record rollback could occur while enqueuing a job. In this
+    case the job would enqueue even though the database deletion
+    rolledback putting things in a funky state.
 
-*   Remove deprecated `#insert_fixtures` from the database adapters.
+    Now the jobs are only enqueued until after the db transaction has been committed.
 
-    *Rafael Mendonça França*
+    *Cory Gwin*
 
-*   Remove deprecated `ActiveRecord::ConnectionAdapters::SQLite3Adapter#valid_alter_table_type?`.
+*   Fix malformed packet error in MySQL statement for connection configuration.
 
-    *Rafael Mendonça França*
+    *robinroestenburg*
 
-*   Do not allow passing the column name to `sum` when a block is passed.
+*   Connection specification now passes the "url" key as a configuration for the
+    adapter if the "url" protocol is "jdbc", "http", or "https". Previously only
+    urls with the "jdbc" prefix were passed to the Active Record Adapter, others
+    are assumed to be adapter specification urls.
 
-    *Rafael Mendonça França*
+    Fixes #41137.
 
-*   Do not allow passing the column name to `count` when a block is passed.
+    *Jonathan Bracy*
 
-    *Rafael Mendonça França*
+*   Fix granular connection swapping when there are multiple abstract classes.
 
-*   Remove delegation of missing methods in a relation to arel.
+    *Eileen M. Uchitelle*
 
-    *Rafael Mendonça França*
+*   Fix `find_by` with custom primary key for belongs_to association.
 
-*   Remove delegation of missing methods in a relation to private methods of the class.
+    *Ryuta Kamizono*
 
-    *Rafael Mendonça França*
+*   Add support for `rails console --sandbox` for multiple database applications.
 
-*   Deprecate `config.activerecord.sqlite3.represent_boolean_as_integer`.
+    *alpaca-tc*
 
-    *Rafael Mendonça França*
+*   Fix `where` on polymorphic association with empty array.
 
-*   Change `SQLite3Adapter` to always represent boolean values as integers.
+    *Ryuta Kamizono*
 
-    *Rafael Mendonça França*
+*   Fix preventing writes for `ApplicationRecord`.
 
-*   Remove ability to specify a timestamp name for `#cache_key`.
+    *Eileen M. Uchitelle*
 
-    *Rafael Mendonça França*
 
-*   Remove deprecated `ActiveRecord::Migrator.migrations_path=`.
+## Rails 6.1.1 (January 07, 2021) ##
 
-    *Rafael Mendonça França*
+*   Fix fixtures loading when strict loading is enabled for the association.
 
-*   Remove deprecated `expand_hash_conditions_for_aggregates`.
+    *Alex Ghiculescu*
 
-    *Rafael Mendonça França*
+*   Fix `where` with custom primary key for belongs_to association.
 
-*   Set polymorphic type column to NULL on `dependent: :nullify` strategy.
+    *Ryuta Kamizono*
 
-    On polymorphic associations both the foreign key and the foreign type columns will be set to NULL.
+*   Fix `where` with aliased associations.
 
-    *Laerti Papa*
+    *Ryuta Kamizono*
 
-*   Allow permitted instance of `ActionController::Parameters` as argument of `ActiveRecord::Relation#exists?`.
+*   Fix `composed_of` with symbol mapping.
 
-    *Gannon McGibbon*
+    *Ryuta Kamizono*
 
-*   Add support for endless ranges introduces in Ruby 2.6.
+*   Don't skip money's type cast for pluck and calculations.
 
-    *Greg Navis*
+    *Ryuta Kamizono*
 
-*   Deprecate passing `migrations_paths` to `connection.assume_migrated_upto_version`.
+*   Fix `where` on polymorphic association with non Active Record object.
 
     *Ryuta Kamizono*
 
-*   MySQL: `ROW_FORMAT=DYNAMIC` create table option by default.
+*   Make sure `db:prepare` works even the schema file doesn't exist.
+
+    *Rafael Mendonça França*
 
-    Since MySQL 5.7.9, the `innodb_default_row_format` option defines the default row
-    format for InnoDB tables. The default setting is `DYNAMIC`.
-    The row format is required for indexing on `varchar(255)` with `utf8mb4` columns.
+*   Fix complicated `has_many :through` with nested where condition.
 
     *Ryuta Kamizono*
 
-*   Fix join table column quoting with SQLite.
-
-    *Gannon McGibbon*
+*   Handle STI models for `has_many dependent: :destroy_async`.
 
-*   Allow disabling scopes generated by `ActiveRecord.enum`.
+    *Muhammad Usman*
 
-    *Alfred Dominic*
+*   Restore possibility of passing `false` to :polymorphic option of `belongs_to`.
 
-*   Ensure that `delete_all` on collection proxy returns affected count.
+    Previously, passing `false` would trigger the option validation logic
+    to throw an error saying :polymorphic would not be a valid option.
 
-    *Ryuta Kamizono*
+    *glaszig*
 
-*   Reset scope after delete on collection association to clear stale offsets of removed records.
+*   Allow adding nonnamed expression indexes to be revertible.
 
-    *Gannon McGibbon*
+    Fixes #40732.
 
-*   Add the ability to prevent writes to a database for the duration of a block.
+    Previously, the following code would raise an error, when executed while rolling back,
+    and the index name should be specified explicitly. Now, the index name is inferred
+    automatically.
 
-    Allows the application to prevent writes to a database. This can be useful when
-    you're building out multiple databases and want to make sure you're not sending
-    writes when you want a read.
+    ```ruby
+    add_index(:items, "to_tsvector('english', description)")
+    ```
 
-    If `while_preventing_writes` is called and the query is considered a write
-    query the database will raise an exception regardless of whether the database
-    user is able to write.
+    *fatkodima*
 
-    This is not meant to be a catch-all for write queries but rather a way to enforce
-    read-only queries without opening a second connection. One purpose of this is to
-    catch accidental writes, not all writes.
 
-    *Eileen M. Uchitelle*
+## Rails 6.1.0 (December 09, 2020) ##
 
-*   Allow aliased attributes to be used in `#update_columns` and `#update`.
+*   Only warn about negative enums if a positive form that would cause conflicts exists.
 
-    *Gannon McGibbon*
+    Fixes #39065.
 
-*   Allow spaces in postgres table names.
+    *Alex Ghiculescu*
 
-    Fixes issue where "user post" is misinterpreted as "\"user\".\"post\"" when quoting table names with the postgres adapter.
+*   Change `attribute_for_inspect` to take `filter_attributes` in consideration.
 
-    *Gannon McGibbon*
+    *Rafael Mendonça França*
 
-*   Cached `columns_hash` fields should be excluded from `ResultSet#column_types`.
+*   Fix odd behavior of inverse_of with multiple belongs_to to same class.
 
-    PR #34528 addresses the inconsistent behaviour when attribute is defined for an ignored column. The following test
-    was passing for SQLite and MySQL, but failed for PostgreSQL:
+    Fixes #35204.
 
-    ```ruby
-    class DeveloperName < ActiveRecord::Type::String
-      def deserialize(value)
-        "Developer: #{value}"
-      end
-    end
+    *Tomoyuki Kai*
 
-    class AttributedDeveloper < ActiveRecord::Base
-      self.table_name = "developers"
+*   Build predicate conditions with objects that delegate `#id` and primary key:
 
-      attribute :name, DeveloperName.new
+    ```ruby
+    class AdminAuthor
+      delegate_missing_to :@author
 
-      self.ignored_columns += ["name"]
+      def initialize(author)
+        @author = author
+      end
     end
 
-    developer = AttributedDeveloper.create
-    developer.update_column :name, "name"
-
-    loaded_developer = AttributedDeveloper.where(id: developer.id).select("*").first
-    puts loaded_developer.name # should be "Developer: name" but it's just "name"
+    Post.where(author: AdminAuthor.new(author))
     ```
 
-    *Dmitry Tsepelev*
+    *Sean Doyle*
 
-*   Make the implicit order column configurable.
+*   Add `connected_to_many` API.
 
-    When calling ordered finder methods such as `first` or `last` without an
-    explicit order clause, ActiveRecord sorts records by primary key. This can
-    result in unpredictable and surprising behaviour when the primary key is
-    not an auto-incrementing integer, for example when it's a UUID. This change
-    makes it possible to override the column used for implicit ordering such
-    that `first` and `last` will return more predictable results.
+    This API allows applications to connect to multiple databases at once without switching all of them or implementing a deeply nested stack.
 
-    Example:
+    Before:
 
-        class Project < ActiveRecord::Base
-          self.implicit_order_column = "created_at"
+        AnimalsRecord.connected_to(role: :reading) do
+          MealsRecord.connected_to(role: :reading) do
+            Dog.first # read from animals replica
+            Dinner.first # read from meals replica
+            Person.first # read from primary writer
+          end
         end
 
-    *Tekin Suleyman*
+    After:
+
+        ActiveRecord::Base.connected_to_many([AnimalsRecord, MealsRecord], role: :reading) do
+          Dog.first # read from animals replica
+          Dinner.first # read from meals replica
+          Person.first # read from primary writer
+        end
 
-*   Bump minimum PostgreSQL version to 9.3.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    *Yasuo Honda*
+*   Add option to raise or log for `ActiveRecord::StrictLoadingViolationError`.
 
-*   Values of enum are frozen, raising an error when attempting to modify them.
+    Some applications may not want to raise an error in production if using `strict_loading`. This would allow an application to set strict loading to log for the production environment while still raising in development and test environments.
 
-    *Emmanuel Byrd*
+    Set `config.active_record.action_on_strict_loading_violation` to `:log` errors instead of raising.
 
-*   Move `ActiveRecord::StatementInvalid` SQL to error property and include binds as separate error property.
+    *Eileen M. Uchitelle*
 
-    `ActiveRecord::ConnectionAdapters::AbstractAdapter#translate_exception_class` now requires `binds` to be passed as the last argument.
+*   Allow the inverse of a `has_one` association that was previously autosaved to be loaded.
 
-    `ActiveRecord::ConnectionAdapters::AbstractAdapter#translate_exception` now requires `message`, `sql`, and `binds` to be passed as keyword arguments.
+    Fixes #34255.
 
-    Subclasses of `ActiveRecord::StatementInvalid` must now provide `sql:` and `binds:` arguments to `super`.
+    *Steven Weber*
 
-    Example:
+*   Optimise the length of index names for polymorphic references by using the reference name rather than the type and id column names.
 
-    ```
-    class MySubclassedError < ActiveRecord::StatementInvalid
-      def initialize(message, sql:, binds:)
-        super(message, sql: sql, binds: binds)
-      end
-    end
-    ```
+    Because the default behaviour when adding an index with multiple columns is to use all column names in the index name, this could frequently lead to overly long index names for polymorphic references which would fail the migration if it exceeded the database limit.
 
-    *Gannon McGibbon*
+    This change reduces the chance of that happening by using the reference name, e.g. `index_my_table_on_my_reference`.
 
-*   Add an `:if_not_exists` option to `create_table`.
+    Fixes #38655.
 
-    Example:
+    *Luke Redpath*
 
-        create_table :posts, if_not_exists: true do |t|
-          t.string :title
-        end
+*   MySQL: Uniqueness validator now respects default database collation,
+    no longer enforce case sensitive comparison by default.
 
-    That would execute:
+    *Ryuta Kamizono*
 
-        CREATE TABLE IF NOT EXISTS posts (
-          ...
-        )
+*   Remove deprecated methods from `ActiveRecord::ConnectionAdapters::DatabaseLimits`.
 
-    If the table already exists, `if_not_exists: false` (the default) raises an
-    exception whereas `if_not_exists: true` does nothing.
+    `column_name_length`
+    `table_name_length`
+    `columns_per_table`
+    `indexes_per_table`
+    `columns_per_multicolumn_index`
+    `sql_query_length`
+    `joins_per_query`
 
-    *fatkodima*, *Stefan Kanev*
+    *Rafael Mendonça França*
 
-*   Defining an Enum as a Hash with blank key, or as an Array with a blank value, now raises an `ArgumentError`.
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::AbstractAdapter#supports_multi_insert?`.
 
-    *Christophe Maximin*
+    *Rafael Mendonça França*
 
-*   Adds support for multiple databases to `rails db:schema:cache:dump` and `rails db:schema:cache:clear`.
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::AbstractAdapter#supports_foreign_keys_in_create?`.
 
-    *Gannon McGibbon*
+    *Rafael Mendonça França*
 
-*   `update_columns` now correctly raises `ActiveModel::MissingAttributeError`
-    if the attribute does not exist.
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::PostgreSQLAdapter#supports_ranges?`.
 
-    *Sean Griffin*
+    *Rafael Mendonça França*
 
-*   Add support for hash and URL configs in database hash of `ActiveRecord::Base.connected_to`.
+*   Remove deprecated `ActiveRecord::Base#update_attributes` and `ActiveRecord::Base#update_attributes!`.
 
-    ````
-    User.connected_to(database: { writing: "postgres://foo" }) do
-      User.create!(name: "Gannon")
-    end
+    *Rafael Mendonça França*
 
-    config = { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" }
-    User.connected_to(database: { reading: config }) do
-      User.count
-    end
-    ````
+*   Remove deprecated `migrations_path` argument in `ActiveRecord::ConnectionAdapter::SchemaStatements#assume_migrated_upto_version`.
 
-    *Gannon McGibbon*
+    *Rafael Mendonça França*
 
-*   Support default expression for MySQL.
+*   Remove deprecated `config.active_record.sqlite3.represent_boolean_as_integer`.
 
-    MySQL 8.0.13 and higher supports default value to be a function or expression.
+    *Rafael Mendonça França*
 
-    https://dev.mysql.com/doc/refman/8.0/en/create-table.html
+*   `relation.create` does no longer leak scope to class level querying methods
+    in initialization block and callbacks.
 
-    *Ryuta Kamizono*
+    Before:
 
-*   Support expression indexes for MySQL.
+        User.where(name: "John").create do |john|
+          User.find_by(name: "David") # => nil
+        end
 
-    MySQL 8.0.13 and higher supports functional key parts that index
-    expression values rather than column or column prefix values.
+    After:
 
-    https://dev.mysql.com/doc/refman/8.0/en/create-index.html
+        User.where(name: "John").create do |john|
+          User.find_by(name: "David") # => #<User name: "David", ...>
+        end
 
     *Ryuta Kamizono*
 
-*   Fix collection cache key with limit and custom select to avoid ambiguous timestamp column error.
+*   Named scope chain does no longer leak scope to class level querying methods.
 
-    Fixes #33056.
+        class User < ActiveRecord::Base
+          scope :david, -> { User.where(name: "David") }
+        end
 
-    *Federico Martinez*
+    Before:
 
-*   Add basic API for connection switching to support multiple databases.
+        User.where(name: "John").david
+        # SELECT * FROM users WHERE name = 'John' AND name = 'David'
 
-    1) Adds a `connects_to` method for models to connect to multiple databases. Example:
+    After:
 
-    ```
-    class AnimalsModel < ApplicationRecord
-      self.abstract_class = true
+        User.where(name: "John").david
+        # SELECT * FROM users WHERE name = 'David'
 
-      connects_to database: { writing: :animals_primary, reading: :animals_replica }
-    end
+    *Ryuta Kamizono*
 
-    class Dog < AnimalsModel
-      # connected to both the animals_primary db for writing and the animals_replica for reading
-    end
-    ```
+*   Remove deprecated methods from `ActiveRecord::DatabaseConfigurations`.
 
-    2) Adds a `connected_to` block method for switching connection roles or connecting to
-    a database that the model didn't connect to. Connecting to the database in this block is
-    useful when you have another defined connection, for example `slow_replica` that you don't
-    want to connect to by default but need in the console, or a specific code block.
+    `fetch`
+    `each`
+    `first`
+    `values`
+    `[]=`
 
-    ```
-    ActiveRecord::Base.connected_to(role: :reading) do
-      Dog.first # finds dog from replica connected to AnimalsBase
-      Book.first # doesn't have a reading connection, will raise an error
-    end
-    ```
+    *Rafael Mendonça França*
 
-    ```
-    ActiveRecord::Base.connected_to(database: :slow_replica) do
-      SlowReplicaModel.first # if the db config has a slow_replica configuration this will be used to do the lookup, otherwise this will throw an exception
-    end
-    ```
+*   `where.not` now generates NAND predicates instead of NOR.
 
-    *Eileen M. Uchitelle*
+     Before:
 
-*   Enum raises on invalid definition values
+        User.where.not(name: "Jon", role: "admin")
+        # SELECT * FROM users WHERE name != 'Jon' AND role != 'admin'
 
-    When defining a Hash enum it can be easy to use `[]` instead of `{}`. This
-    commit checks that only valid definition values are provided, those can
-    be a Hash, an array of Symbols or an array of Strings. Otherwise it
-    raises an `ArgumentError`.
+     After:
 
-    Fixes #33961
+        User.where.not(name: "Jon", role: "admin")
+        # SELECT * FROM users WHERE NOT (name == 'Jon' AND role == 'admin')
 
-    *Alberto Almagro*
+    *Rafael Mendonça França*
 
-*   Reloading associations now clears the Query Cache like `Persistence#reload` does.
+*   Remove deprecated `ActiveRecord::Result#to_hash` method.
 
-    ```
-    class Post < ActiveRecord::Base
-      has_one :category
-      belongs_to :author
-      has_many :comments
-    end
+    *Rafael Mendonça França*
 
-    # Each of the following will now clear the query cache.
-    post.reload_category
-    post.reload_author
-    post.comments.reload
-    ```
+*   Deprecate `ActiveRecord::Base.allow_unsafe_raw_sql`.
 
-    *Christophe Maximin*
+    *Rafael Mendonça França*
 
-*   Added `index` option for `change_table` migration helpers.
-    With this change you can create indexes while adding new
-    columns into the existing tables.
+*   Remove deprecated support for using unsafe raw SQL in `ActiveRecord::Relation` methods.
 
-    Example:
+    *Rafael Mendonça França*
 
-        change_table(:languages) do |t|
-          t.string :country_code, index: true
-        end
+*   Allow users to silence the "Rails couldn't infer whether you are using multiple databases..."
+    message using `config.active_record.suppress_multiple_database_warning`.
 
-    *Mehmet Emin İNAÇ*
+    *Omri Gabay*
 
-*   Fix `transaction` reverting for migrations.
+*   Connections can be granularly switched for abstract classes when `connected_to` is called.
 
-    Before: Commands inside a `transaction` in a reverted migration ran uninverted.
-    Now: This change fixes that by reverting commands inside `transaction` block.
+    This change allows `connected_to` to switch a `role` and/or `shard` for a single abstract class instead of all classes globally. Applications that want to use the new feature need to set `config.active_record.legacy_connection_handling` to `false` in their application configuration.
 
-    *fatkodima*, *David Verhasselt*
+    Example usage:
 
-*   Raise an error instead of scanning the filesystem root when `fixture_path` is blank.
+    Given an application we have a `User` model that inherits from `ApplicationRecord` and a `Dog` model that inherits from `AnimalsRecord`. `AnimalsRecord` and `ApplicationRecord` have writing and reading connections as well as shard `default`, `one`, and `two`.
 
-    *Gannon McGibbon*, *Max Albrecht*
+    ```ruby
+    ActiveRecord::Base.connected_to(role: :reading) do
+      User.first # reads from default replica
+      Dog.first # reads from default replica
 
-*   Allow `ActiveRecord::Base.configurations=` to be set with a symbolized hash.
+      AnimalsRecord.connected_to(role: :writing, shard: :one) do
+        User.first # reads from default replica
+        Dog.first # reads from shard one primary
+      end
 
-    *Gannon McGibbon*
+      User.first # reads from default replica
+      Dog.first # reads from default replica
 
-*   Don't update counter cache unless the record is actually saved.
+      ApplicationRecord.connected_to(role: :writing, shard: :two) do
+        User.first # reads from shard two primary
+        Dog.first # reads from default replica
+      end
+    end
+    ```
 
-    Fixes #31493, #33113, #33117.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    *Ryuta Kamizono*
+*   Allow double-dash comment syntax when querying read-only databases
 
-*   Deprecate `ActiveRecord::Result#to_hash` in favor of `ActiveRecord::Result#to_a`.
+    *James Adam*
 
-    *Gannon McGibbon*, *Kevin Cheng*
+*   Add `values_at` method.
 
-*   SQLite3 adapter supports expression indexes.
+    Returns an array containing the values associated with the given methods.
 
+    ```ruby
+    topic = Topic.first
+    topic.values_at(:title, :author_name)
+    # => ["Budget", "Jason"]
     ```
-    create_table :users do |t|
-      t.string :email
-    end
 
-    add_index :users, 'lower(email)', name: 'index_users_on_email', unique: true
-    ```
+    Similar to `Hash#values_at` but on an Active Record instance.
 
-    *Gray Kemmey*
+    *Guillaume Briday*
 
-*   Allow subclasses to redefine autosave callbacks for associated records.
+*   Fix `read_attribute_before_type_cast` to consider attribute aliases.
 
-    Fixes #33305.
+    *Marcelo Lauxen*
 
-    *Andrey Subbota*
+*   Support passing record to uniqueness validator `:conditions` callable:
 
-*   Bump minimum MySQL version to 5.5.8.
+    ```ruby
+    class Article < ApplicationRecord
+      validates_uniqueness_of :title, conditions: ->(article) {
+        published_at = article.published_at
+        where(published_at: published_at.beginning_of_year..published_at.end_of_year)
+      }
+    end
+    ```
 
-    *Yasuo Honda*
+    *Eliot Sykes*
 
-*   Use MySQL utf8mb4 character set by default.
+*   `BatchEnumerator#update_all` and `BatchEnumerator#delete_all` now return the
+    total number of rows affected, just like their non-batched counterparts.
 
-    `utf8mb4` character set with 4-Byte encoding supports supplementary characters including emoji.
-    The previous default 3-Byte encoding character set `utf8` is not enough to support them.
+    ```ruby
+    Person.in_batches.update_all("first_name = 'Eugene'") # => 42
+    Person.in_batches.delete_all # => 42
+    ```
 
-    *Yasuo Honda*
+    Fixes #40287.
 
-*   Fix duplicated record creation when using nested attributes with `create_with`.
+    *Eugene Kenny*
 
-    *Darwin Wu*
+*   Add support for PostgreSQL `interval` data type with conversion to
+    `ActiveSupport::Duration` when loading records from database and
+    serialization to ISO 8601 formatted duration string on save.
+    Add support to define a column in migrations and get it in a schema dump.
+    Optional column precision is supported.
 
-*   Configuration item `config.filter_parameters` could also filter out
-    sensitive values of database columns when calling `#inspect`.
-    We also added `ActiveRecord::Base::filter_attributes`/`=` in order to
-    specify sensitive attributes to specific model.
+    To use this in 6.1, you need to place the next string to your model file:
 
-    ```
-    Rails.application.config.filter_parameters += [:credit_card_number, /phone/]
-    Account.last.inspect # => #<Account id: 123, name: "DHH", credit_card_number: [FILTERED], telephone_number: [FILTERED] ...>
-    SecureAccount.filter_attributes += [:name]
-    SecureAccount.last.inspect # => #<SecureAccount id: 42, name: [FILTERED], credit_card_number: [FILTERED] ...>
-    ```
+        attribute :duration, :interval
 
-    *Zhang Kang*, *Yoshiyuki Kinjo*
+    To keep old behavior until 7.0 is released:
 
-*   Deprecate `column_name_length`, `table_name_length`, `columns_per_table`,
-    `indexes_per_table`, `columns_per_multicolumn_index`, `sql_query_length`,
-    and `joins_per_query` methods in `DatabaseLimits`.
+        attribute :duration, :string
 
-    *Ryuta Kamizono*
+    Example:
 
-*   `ActiveRecord::Base.configurations` now returns an object.
+        create_table :events do |t|
+          t.string   :name
+          t.interval :duration
+        end
 
-    `ActiveRecord::Base.configurations` used to return a hash, but this
-    is an inflexible data model. In order to improve multiple-database
-    handling in Rails, we've changed this to return an object. Some methods
-    are provided to make the object behave hash-like in order to ease the
-    transition process. Since most applications don't manipulate the hash
-    we've decided to add backwards-compatible functionality that will throw
-    a deprecation warning if used, however calling `ActiveRecord::Base.configurations`
-    will use the new version internally and externally.
+        class Event < ApplicationRecord
+          attribute :duration, :interval
+        end
 
-    For example, the following `database.yml`:
+        Event.create!(name: 'Rock Fest', duration: 2.days)
+        Event.last.duration # => 2 days
+        Event.last.duration.iso8601 # => "P2D"
+        Event.new(duration: 'P1DT12H3S').duration # => 1 day, 12 hours, and 3 seconds
+        Event.new(duration: '1 day') # Unknown value will be ignored and NULL will be written to database
 
-    ```
-    development:
-      adapter: sqlite3
-      database: db/development.sqlite3
-    ```
+    *Andrey Novikov*
 
-    Used to become a hash:
+*   Allow associations supporting the `dependent:` key to take `dependent: :destroy_async`.
 
-    ```
-    { "development" => { "adapter" => "sqlite3", "database" => "db/development.sqlite3" } }
+    ```ruby
+    class Account < ActiveRecord::Base
+        belongs_to :supplier, dependent: :destroy_async
+    end
     ```
 
-    Is now converted into the following object:
+    `:destroy_async` will enqueue a job to destroy associated records in the background.
 
-    ```
-    #<ActiveRecord::DatabaseConfigurations:0x00007fd1acbdf800 @configurations=[
-      #<ActiveRecord::DatabaseConfigurations::HashConfig:0x00007fd1acbded10 @env_name="development",
-        @spec_name="primary", @config={"adapter"=>"sqlite3", "database"=>"db/development.sqlite3"}>
-      ]
-    ```
+    *DHH*, *George Claghorn*, *Cory Gwin*, *Rafael Mendonça França*, *Adrianna Chang*
 
-    Iterating over the database configurations has also changed. Instead of
-    calling hash methods on the `configurations` hash directly, a new method `configs_for` has
-    been provided that allows you to select the correct configuration. `env_name` and
-    `spec_name` arguments are optional. For example, these return an array of
-    database config objects for the requested environment and a single database config object
-    will be returned for the requested environment and specification name respectively.
-
-    ```
-    ActiveRecord::Base.configurations.configs_for(env_name: "development")
-    ActiveRecord::Base.configurations.configs_for(env_name: "development", spec_name: "primary")
-    ```
+*   Add `SKIP_TEST_DATABASE` environment variable to disable modifying the test database when `rails db:create` and `rails db:drop` are called.
 
-    *Eileen M. Uchitelle*, *Aaron Patterson*
+    *Jason Schweier*
 
-*   Add database configuration to disable advisory locks.
+*   `connects_to` can only be called on `ActiveRecord::Base` or abstract classes.
 
-    ```
-    production:
-      adapter: postgresql
-      advisory_locks: false
-    ```
+    Ensure that `connects_to` can only be called from `ActiveRecord::Base` or abstract classes. This protects the application from opening duplicate or too many connections.
 
-    *Guo Xiang*
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-*   SQLite3 adapter `alter_table` method restores foreign keys.
+*   All connection adapters `execute` now raises `ActiveRecord::ConnectionNotEstablished` rather than
+    `ActiveRecord::StatementInvalid` when they encounter a connection error.
 
-    *Yasuo Honda*
+    *Jean Boussier*
 
-*   Allow `:to_table` option to `invert_remove_foreign_key`.
+*   `Mysql2Adapter#quote_string` now raises `ActiveRecord::ConnectionNotEstablished` rather than
+    `ActiveRecord::StatementInvalid` when it can't connect to the MySQL server.
 
-    Example:
+    *Jean Boussier*
 
-       remove_foreign_key :accounts, to_table: :owners
+*   Add support for check constraints that are `NOT VALID` via `validate: false` (PostgreSQL-only).
 
-    *Nikolay Epifanov*, *Rich Chen*
+    *Alex Robbin*
 
-*   Add environment & load_config dependency to `bin/rake db:seed` to enable
-    seed load in environments without Rails and custom DB configuration
+*   Ensure the default configuration is considered primary or first for an environment
 
-    *Tobias Bielohlawek*
+    If a multiple database application provides a configuration named primary, that will be treated as default. In applications that do not have a primary entry, the default database configuration will be the first configuration for an environment.
 
-*   Fix default value for mysql time types with specified precision.
+    *Eileen M. Uchitelle*
 
-    *Nikolay Kondratyev*
+*   Allow `where` references association names as joined table name aliases.
 
-*   Fix `touch` option to behave consistently with `Persistence#touch` method.
+    ```ruby
+    class Comment < ActiveRecord::Base
+      enum label: [:default, :child]
+      has_many :children, class_name: "Comment", foreign_key: :parent_id
+    end
+
+    # ... FROM comments LEFT OUTER JOIN comments children ON ... WHERE children.label = 1
+    Comment.includes(:children).where("children.label": "child")
+    ```
 
     *Ryuta Kamizono*
 
-*   Migrations raise when duplicate column definition.
+*   Support storing demodulized class name for polymorphic type.
 
-    Fixes #33024.
+    Before Rails 6.1, storing demodulized class name is supported only for STI type
+    by `store_full_sti_class` class attribute.
 
-    *Federico Martinez*
+    Now `store_full_class_name` class attribute can handle both STI and polymorphic types.
 
-*   Bump minimum SQLite version to 3.8
+    *Ryuta Kamizono*
 
-    *Yasuo Honda*
+*   Deprecate `rails db:structure:{load, dump}` tasks and extend
+    `rails db:schema:{load, dump}` tasks to work with either `:ruby` or `:sql` format,
+    depending on `config.active_record.schema_format` configuration value.
 
-*   Fix parent record should not get saved with duplicate children records.
+    *fatkodima*
 
-    Fixes #32940.
+*   Respect the `select` values for eager loading.
 
-    *Santosh Wadghule*
+    ```ruby
+    post = Post.select("UPPER(title) AS title").first
+    post.title # => "WELCOME TO THE WEBLOG"
+    post.body  # => ActiveModel::MissingAttributeError
+
+    # Rails 6.0 (ignore the `select` values)
+    post = Post.select("UPPER(title) AS title").eager_load(:comments).first
+    post.title # => "Welcome to the weblog"
+    post.body  # => "Such a lovely day"
+
+    # Rails 6.1 (respect the `select` values)
+    post = Post.select("UPPER(title) AS title").eager_load(:comments).first
+    post.title # => "WELCOME TO THE WEBLOG"
+    post.body  # => ActiveModel::MissingAttributeError
+    ```
 
-*   Fix logic on disabling commit callbacks so they are not called unexpectedly when errors occur.
+    *Ryuta Kamizono*
 
-    *Brian Durand*
+*   Allow attribute's default to be configured but keeping its own type.
 
-*   Ensure `Associations::CollectionAssociation#size` and `Associations::CollectionAssociation#empty?`
-    use loaded association ids if present.
+    ```ruby
+    class Post < ActiveRecord::Base
+      attribute :written_at, default: -> { Time.now.utc }
+    end
 
-    *Graham Turner*
+    # Rails 6.0
+    Post.type_for_attribute(:written_at) # => #<Type::Value ... precision: nil, ...>
 
-*   Add support to preload associations of polymorphic associations when not all the records have the requested associations.
+    # Rails 6.1
+    Post.type_for_attribute(:written_at) # => #<Type::DateTime ... precision: 6, ...>
+    ```
 
-    *Dana Sherson*
+    *Ryuta Kamizono*
 
-*   Add `touch_all` method to `ActiveRecord::Relation`.
+*   Allow default to be configured for Enum.
 
-    Example:
+    ```ruby
+    class Book < ActiveRecord::Base
+      enum status: [:proposed, :written, :published], _default: :published
+    end
 
-        Person.where(name: "David").touch_all(time: Time.new(2020, 5, 16, 0, 0, 0))
+    Book.new.status # => "published"
+    ```
+
+    *Ryuta Kamizono*
 
-    *fatkodima*, *duggiefresh*
+*   Deprecate YAML loading from legacy format older than Rails 5.0.
 
-*   Add `ActiveRecord::Base.base_class?` predicate.
+    *Ryuta Kamizono*
 
-    *Bogdan Gusiev*
+*   Added the setting `ActiveRecord::Base.immutable_strings_by_default`, which
+    allows you to specify that all string columns should be frozen unless
+    otherwise specified. This will reduce memory pressure for applications which
+    do not generally mutate string properties of Active Record objects.
 
-*   Add custom prefix/suffix options to `ActiveRecord::Store.store_accessor`.
+    *Sean Griffin*, *Ryuta Kamizono*
 
-    *Tan Huynh*, *Yukio Mizuta*
+*   Deprecate `map!` and `collect!` on `ActiveRecord::Result`.
 
-*   Rails 6 requires Ruby 2.5.0 or newer.
+    *Ryuta Kamizono*
 
-    *Jeremy Daer*, *Kasper Timm Hansen*
+*   Support `relation.and` for intersection as Set theory.
 
-*   Deprecate `update_attributes`/`!` in favor of `update`/`!`.
+    ```ruby
+    david_and_mary = Author.where(id: [david, mary])
+    mary_and_bob   = Author.where(id: [mary, bob])
 
-    *Eddie Lebow*
+    david_and_mary.merge(mary_and_bob) # => [mary, bob]
 
-*   Add `ActiveRecord::Base.create_or_find_by`/`!` to deal with the SELECT/INSERT race condition in
-    `ActiveRecord::Base.find_or_create_by`/`!` by leaning on unique constraints in the database.
+    david_and_mary.and(mary_and_bob) # => [mary]
+    david_and_mary.or(mary_and_bob)  # => [david, mary, bob]
+    ```
+
+    *Ryuta Kamizono*
+
+*   Merging conditions on the same column no longer maintain both conditions,
+    and will be consistently replaced by the latter condition in Rails 7.0.
+    To migrate to Rails 7.0's behavior, use `relation.merge(other, rewhere: true)`.
+
+    ```ruby
+    # Rails 6.1 (IN clause is replaced by merger side equality condition)
+    Author.where(id: [david.id, mary.id]).merge(Author.where(id: bob)) # => [bob]
+
+    # Rails 6.1 (both conflict conditions exists, deprecated)
+    Author.where(id: david.id..mary.id).merge(Author.where(id: bob)) # => []
+
+    # Rails 6.1 with rewhere to migrate to Rails 7.0's behavior
+    Author.where(id: david.id..mary.id).merge(Author.where(id: bob), rewhere: true) # => [bob]
+
+    # Rails 7.0 (same behavior with IN clause, mergee side condition is consistently replaced)
+    Author.where(id: [david.id, mary.id]).merge(Author.where(id: bob)) # => [bob]
+    Author.where(id: david.id..mary.id).merge(Author.where(id: bob)) # => [bob]
+    ```
+
+    *Ryuta Kamizono*
+
+*   Do not mark Postgresql MAC address and UUID attributes as changed when the assigned value only varies by case.
+
+    *Peter Fry*
+
+*   Resolve issue with insert_all unique_by option when used with expression index.
+
+    When the `:unique_by` option of `ActiveRecord::Persistence.insert_all` and
+    `ActiveRecord::Persistence.upsert_all` was used with the name of an expression index, an error
+    was raised. Adding a guard around the formatting behavior for the `:unique_by` corrects this.
+
+    Usage:
+
+    ```ruby
+    create_table :books, id: :integer, force: true do |t|
+      t.column :name, :string
+      t.index "lower(name)", unique: true
+    end
+
+    Book.insert_all [{ name: "MyTest" }], unique_by: :index_books_on_lower_name
+    ```
+
+    Fixes #39516.
+
+    *Austen Madden*
+
+*   Add basic support for CHECK constraints to database migrations.
+
+    Usage:
+
+    ```ruby
+    add_check_constraint :products, "price > 0", name: "price_check"
+    remove_check_constraint :products, name: "price_check"
+    ```
+
+    *fatkodima*
+
+*   Add `ActiveRecord::Base.strict_loading_by_default` and `ActiveRecord::Base.strict_loading_by_default=`
+    to enable/disable strict_loading mode by default for a model. The configuration's value is
+    inheritable by subclasses, but they can override that value and it will not impact parent class.
+
+    Usage:
+
+    ```ruby
+    class Developer < ApplicationRecord
+      self.strict_loading_by_default = true
+
+      has_many :projects
+    end
+
+    dev = Developer.first
+    dev.projects.first
+    # => ActiveRecord::StrictLoadingViolationError Exception: Developer is marked as strict_loading and Project cannot be lazily loaded.
+    ```
+
+    *bogdanvlviv*
+
+*   Deprecate passing an Active Record object to `quote`/`type_cast` directly.
+
+    *Ryuta Kamizono*
+
+*   Default engine `ENGINE=InnoDB` is no longer dumped to make schema more agnostic.
+
+    Before:
+
+    ```ruby
+    create_table "accounts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci", force: :cascade do |t|
+    end
+    ```
+
+    After:
+
+    ```ruby
+    create_table "accounts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    end
+    ```
+
+    *Ryuta Kamizono*
+
+*   Added delegated type as an alternative to single-table inheritance for representing class hierarchies.
+    See ActiveRecord::DelegatedType for the full description.
 
     *DHH*
 
-*   Add `Relation#pick` as short-hand for single-value plucks.
+*   Deprecate aggregations with group by duplicated fields.
+
+    To migrate to Rails 7.0's behavior, use `uniq!(:group)` to deduplicate group fields.
+
+    ```ruby
+    accounts = Account.group(:firm_id)
+
+    # duplicated group fields, deprecated.
+    accounts.merge(accounts.where.not(credit_limit: nil)).sum(:credit_limit)
+    # => {
+    #   [1, 1] => 50,
+    #   [2, 2] => 60
+    # }
+
+    # use `uniq!(:group)` to deduplicate group fields.
+    accounts.merge(accounts.where.not(credit_limit: nil)).uniq!(:group).sum(:credit_limit)
+    # => {
+    #   1 => 50,
+    #   2 => 60
+    # }
+    ```
+
+    *Ryuta Kamizono*
+
+*   Deprecate duplicated query annotations.
+
+    To migrate to Rails 7.0's behavior, use `uniq!(:annotate)` to deduplicate query annotations.
+
+    ```ruby
+    accounts = Account.where(id: [1, 2]).annotate("david and mary")
+
+    # duplicated annotations, deprecated.
+    accounts.merge(accounts.rewhere(id: 3))
+    # SELECT accounts.* FROM accounts WHERE accounts.id = 3 /* david and mary */ /* david and mary */
+
+    # use `uniq!(:annotate)` to deduplicate annotations.
+    accounts.merge(accounts.rewhere(id: 3)).uniq!(:annotate)
+    # SELECT accounts.* FROM accounts WHERE accounts.id = 3 /* david and mary */
+    ```
+
+    *Ryuta Kamizono*
+
+*   Resolve conflict between counter cache and optimistic locking.
+
+    Bump an Active Record instance's lock version after updating its counter
+    cache. This avoids raising an unnecessary `ActiveRecord::StaleObjectError`
+    upon subsequent transactions by maintaining parity with the corresponding
+    database record's `lock_version` column.
+
+    Fixes #16449.
+
+    *Aaron Lipman*
+
+*   Support merging option `:rewhere` to allow mergee side condition to be replaced exactly.
+
+    ```ruby
+    david_and_mary = Author.where(id: david.id..mary.id)
+
+    # both conflict conditions exists
+    david_and_mary.merge(Author.where(id: bob)) # => []
+
+    # mergee side condition is replaced by rewhere
+    david_and_mary.merge(Author.rewhere(id: bob)) # => [bob]
+
+    # mergee side condition is replaced by rewhere option
+    david_and_mary.merge(Author.where(id: bob), rewhere: true) # => [bob]
+    ```
+
+    *Ryuta Kamizono*
+
+*   Add support for finding records based on signed ids, which are tamper-proof, verified ids that can be
+    set to expire and scoped with a purpose. This is particularly useful for things like password reset
+    or email verification, where you want the bearer of the signed id to be able to interact with the
+    underlying record, but usually only within a certain time period.
+
+    ```ruby
+    signed_id = User.first.signed_id expires_in: 15.minutes, purpose: :password_reset
+
+    User.find_signed signed_id # => nil, since the purpose does not match
+
+    travel 16.minutes
+    User.find_signed signed_id, purpose: :password_reset # => nil, since the signed id has expired
+
+    travel_back
+    User.find_signed signed_id, purpose: :password_reset # => User.first
+
+    User.find_signed! "bad data" # => ActiveSupport::MessageVerifier::InvalidSignature
+    ```
 
     *DHH*
 
+*   Support `ALGORITHM = INSTANT` DDL option for index operations on MySQL.
+
+    *Ryuta Kamizono*
+
+*   Fix index creation to preserve index comment in bulk change table on MySQL.
+
+    *Ryuta Kamizono*
+
+*   Allow `unscope` to be aware of table name qualified values.
+
+    It is possible to unscope only the column in the specified table.
+
+    ```ruby
+    posts = Post.joins(:comments).group(:"posts.hidden")
+    posts = posts.where("posts.hidden": false, "comments.hidden": false)
+
+    posts.count
+    # => { false => 10 }
+
+    # unscope both hidden columns
+    posts.unscope(where: :hidden).count
+    # => { false => 11, true => 1 }
+
+    # unscope only comments.hidden column
+    posts.unscope(where: :"comments.hidden").count
+    # => { false => 11 }
+    ```
+
+    *Ryuta Kamizono*, *Slava Korolev*
+
+*   Fix `rewhere` to truly overwrite collided where clause by new where clause.
+
+    ```ruby
+    steve = Person.find_by(name: "Steve")
+    david = Author.find_by(name: "David")
+
+    relation = Essay.where(writer: steve)
+
+    # Before
+    relation.rewhere(writer: david).to_a # => []
+
+    # After
+    relation.rewhere(writer: david).to_a # => [david]
+    ```
+
+    *Ryuta Kamizono*
+
+*   Inspect time attributes with subsec and time zone offset.
+
+    ```ruby
+    p Knot.create
+    => #<Knot id: 1, created_at: "2016-05-05 01:29:47.116928000 +0000">
+    ```
+
+    *akinomaeni*, *Jonathan Hefner*
+
+*   Deprecate passing a column to `type_cast`.
+
+    *Ryuta Kamizono*
+
+*   Deprecate `in_clause_length` and `allowed_index_name_length` in `DatabaseLimits`.
+
+    *Ryuta Kamizono*
+
+*   Support bulk insert/upsert on relation to preserve scope values.
+
+    *Josef Šimánek*, *Ryuta Kamizono*
+
+*   Preserve column comment value on changing column name on MySQL.
+
+    *Islam Taha*
+
+*   Add support for `if_exists` option for removing an index.
+
+    The `remove_index` method can take an `if_exists` option. If this is set to true an error won't be raised if the index doesn't exist.
+
+    *Eileen M. Uchitelle*
+
+*   Remove ibm_db, informix, mssql, oracle, and oracle12 Arel visitors which are not used in the code base.
+
+    *Ryuta Kamizono*
+
+*   Prevent `build_association` from `touching` a parent record if the record isn't persisted for `has_one` associations.
+
+    Fixes #38219.
+
+    *Josh Brody*
+
+*   Add support for `if_not_exists` option for adding index.
+
+    The `add_index` method respects `if_not_exists` option. If it is set to true
+    index won't be added.
+
+    Usage:
+
+    ```ruby
+      add_index :users, :account_id, if_not_exists: true
+    ```
+
+    The `if_not_exists` option passed to `create_table` also gets propagated to indexes
+    created within that migration so that if table and its indexes exist then there is no
+    attempt to create them again.
+
+    *Prathamesh Sonpatki*
+
+*   Add `ActiveRecord::Base#previously_new_record?` to show if a record was new before the last save.
+
+    *Tom Ward*
+
+*   Support descending order for `find_each`, `find_in_batches`, and `in_batches`.
+
+    Batch processing methods allow you to work with the records in batches, greatly reducing memory consumption, but records are always batched from oldest id to newest.
+
+    This change allows reversing the order, batching from newest to oldest. This is useful when you need to process newer batches of records first.
+
+    Pass `order: :desc` to yield batches in descending order. The default remains `order: :asc`.
+
+    ```ruby
+    Person.find_each(order: :desc) do |person|
+      person.party_all_night!
+    end
+    ```
+
+    *Alexey Vasiliev*
+
+*   Fix `insert_all` with enum values.
+
+    Fixes #38716.
+
+    *Joel Blum*
+
+*   Add support for `db:rollback:name` for multiple database applications.
+
+    Multiple database applications will now raise if `db:rollback` is call and recommend using the `db:rollback:[NAME]` to rollback migrations.
+
+    *Eileen M. Uchitelle*
+
+*   `Relation#pick` now uses already loaded results instead of making another query.
+
+    *Eugene Kenny*
+
+*   Deprecate using `return`, `break` or `throw` to exit a transaction block after writes.
+
+    *Dylan Thacker-Smith*
+
+*   Dump the schema or structure of a database when calling `db:migrate:name`.
+
+    In previous versions of Rails, `rails db:migrate` would dump the schema of the database. In Rails 6, that holds true (`rails db:migrate` dumps all databases' schemas), but `rails db:migrate:name` does not share that behavior.
+
+    Going forward, calls to `rails db:migrate:name` will dump the schema (or structure) of the database being migrated.
+
+    *Kyle Thompson*
+
+*   Reset the `ActiveRecord::Base` connection after `rails db:migrate:name`.
+
+    When `rails db:migrate` has finished, it ensures the `ActiveRecord::Base` connection is reset to its original configuration. Going forward, `rails db:migrate:name` will have the same behavior.
+
+    *Kyle Thompson*
+
+*   Disallow calling `connected_to` on subclasses of `ActiveRecord::Base`.
+
+    Behavior has not changed here but the previous API could be misleading to people who thought it would switch connections for only that class. `connected_to` switches the context from which we are getting connections, not the connections themselves.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Add support for horizontal sharding to `connects_to` and `connected_to`.
+
+    Applications can now connect to multiple shards and switch between their shards in an application. Note that the shard swapping is still a manual process as this change does not include an API for automatic shard swapping.
+
+    Usage:
+
+    Given the following configuration:
+
+    ```yaml
+    # config/database.yml
+    production:
+      primary:
+        database: my_database
+      primary_shard_one:
+        database: my_database_shard_one
+    ```
+
+    Connect to multiple shards:
+
+    ```ruby
+    class ApplicationRecord < ActiveRecord::Base
+      self.abstract_class = true
+
+      connects_to shards: {
+        default: { writing: :primary },
+        shard_one: { writing: :primary_shard_one }
+      }
+    ```
+
+    Swap between shards in your controller / model code:
+
+    ```ruby
+    ActiveRecord::Base.connected_to(shard: :shard_one) do
+      # Read from shard one
+    end
+    ```
+
+    The horizontal sharding API also supports read replicas. See guides for more details.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Deprecate `spec_name` in favor of `name` on database configurations.
+
+    The accessors for `spec_name` on `configs_for` and `DatabaseConfig` are deprecated. Please use `name` instead.
+
+    Deprecated behavior:
+
+    ```ruby
+    db_config = ActiveRecord::Base.configurations.configs_for(env_name: "development", spec_name: "primary")
+    db_config.spec_name
+    ```
+
+    New behavior:
+
+    ```ruby
+    db_config = ActiveRecord::Base.configurations.configs_for(env_name: "development", name: "primary")
+    db_config.name
+    ```
+
+    *Eileen M. Uchitelle*
+
+*   Add additional database-specific rake tasks for multi-database users.
+
+    Previously, `rails db:create`, `rails db:drop`, and `rails db:migrate` were the only rails tasks that could operate on a single
+    database. For example:
+
+    ```
+    rails db:create
+    rails db:create:primary
+    rails db:create:animals
+    rails db:drop
+    rails db:drop:primary
+    rails db:drop:animals
+    rails db:migrate
+    rails db:migrate:primary
+    rails db:migrate:animals
+    ```
+
+    With these changes, `rails db:schema:dump`, `rails db:schema:load`, `rails db:structure:dump`, `rails db:structure:load` and
+    `rails db:test:prepare` can additionally operate on a single database. For example:
+
+    ```
+    rails db:schema:dump
+    rails db:schema:dump:primary
+    rails db:schema:dump:animals
+    rails db:schema:load
+    rails db:schema:load:primary
+    rails db:schema:load:animals
+    rails db:structure:dump
+    rails db:structure:dump:primary
+    rails db:structure:dump:animals
+    rails db:structure:load
+    rails db:structure:load:primary
+    rails db:structure:load:animals
+    rails db:test:prepare
+    rails db:test:prepare:primary
+    rails db:test:prepare:animals
+    ```
+
+    *Kyle Thompson*
+
+*   Add support for `strict_loading` mode on association declarations.
+
+    Raise an error if attempting to load a record from an association that has been marked as `strict_loading` unless it was explicitly eager loaded.
+
+    Usage:
+
+    ```ruby
+    class Developer < ApplicationRecord
+      has_many :projects, strict_loading: true
+    end
+
+    dev = Developer.first
+    dev.projects.first
+    # => ActiveRecord::StrictLoadingViolationError: The projects association is marked as strict_loading and cannot be lazily loaded.
+    ```
+
+    *Kevin Deisz*
+
+*   Add support for `strict_loading` mode to prevent lazy loading of records.
+
+    Raise an error if a parent record is marked as `strict_loading` and attempts to lazily load its associations. This is useful for finding places you may want to preload an association and avoid additional queries.
+
+    Usage:
+
+    ```ruby
+    dev = Developer.strict_loading.first
+    dev.audit_logs.to_a
+    # => ActiveRecord::StrictLoadingViolationError: Developer is marked as strict_loading and AuditLog cannot be lazily loaded.
+    ```
+
+    *Eileen M. Uchitelle*, *Aaron Patterson*
+
+*   Add support for PostgreSQL 11+ partitioned indexes when using `upsert_all`.
+
+    *Sebastián Palma*
+
+*   Adds support for `if_not_exists` to `add_column` and `if_exists` to `remove_column`.
+
+    Applications can set their migrations to ignore exceptions raised when adding a column that already exists or when removing a column that does not exist.
+
+    Example Usage:
+
+    ```ruby
+    class AddColumnTitle < ActiveRecord::Migration[6.1]
+      def change
+        add_column :posts, :title, :string, if_not_exists: true
+      end
+    end
+    ```
+
+    ```ruby
+    class RemoveColumnTitle < ActiveRecord::Migration[6.1]
+      def change
+        remove_column :posts, :title, if_exists: true
+      end
+    end
+    ```
+
+    *Eileen M. Uchitelle*
+
+*   Regexp-escape table name for MS SQL Server.
+
+    Add `Regexp.escape` to one method in ActiveRecord, so that table names with regular expression characters in them work as expected. Since MS SQL Server uses "[" and "]" to quote table and column names, and those characters are regular expression characters, methods like `pluck` and `select` fail in certain cases when used with the MS SQL Server adapter.
+
+    *Larry Reid*
+
+*   Store advisory locks on their own named connection.
+
+    Previously advisory locks were taken out against a connection when a migration started. This works fine in single database applications but doesn't work well when migrations need to open new connections which results in the lock getting dropped.
+
+    In order to fix this we are storing the advisory lock on a new connection with the connection specification name `AdvisoryLockBase`. The caveat is that we need to maintain at least 2 connections to a database while migrations are running in order to do this.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Allow schema cache path to be defined in the database configuration file.
+
+    For example:
+
+    ```yaml
+    development:
+      adapter: postgresql
+      database: blog_development
+      pool: 5
+      schema_cache_path: tmp/schema/main.yml
+    ```
+
+    *Katrina Owen*
+
+*   Deprecate `#remove_connection` in favor of `#remove_connection_pool` when called on the handler.
+
+    `#remove_connection` is deprecated in order to support returning a `DatabaseConfig` object instead of a `Hash`. Use `#remove_connection_pool`, `#remove_connection` will be removed in Rails 7.0.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Deprecate `#default_hash` and it's alias `#[]` on database configurations.
+
+    Applications should use `configs_for`. `#default_hash` and `#[]` will be removed in Rails 7.0.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Add scale support to `ActiveRecord::Validations::NumericalityValidator`.
+
+    *Gannon McGibbon*
+
+*   Find orphans by looking for missing relations through chaining `where.missing`:
+
+    Before:
+
+    ```ruby
+    Post.left_joins(:author).where(authors: { id: nil })
+    ```
+
+    After:
+
+    ```ruby
+    Post.where.missing(:author)
+    ```
+
+    *Tom Rossi*
+
+*   Ensure `:reading` connections always raise if a write is attempted.
+
+    Now Rails will raise an `ActiveRecord::ReadOnlyError` if any connection on the reading handler attempts to make a write. If your reading role needs to write you should name the role something other than `:reading`.
+
+    *Eileen M. Uchitelle*
+
+*   Deprecate `"primary"` as the `connection_specification_name` for `ActiveRecord::Base`.
+
+    `"primary"` has been deprecated as the `connection_specification_name` for `ActiveRecord::Base` in favor of using `"ActiveRecord::Base"`. This change affects calls to `ActiveRecord::Base.connection_handler.retrieve_connection` and `ActiveRecord::Base.connection_handler.remove_connection`. If you're calling these methods with `"primary"`, please switch to `"ActiveRecord::Base"`.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Add `ActiveRecord::Validations::NumericalityValidator` with
+    support for casting floats using a database columns' precision value.
+
+    *Gannon McGibbon*
+
+*   Enforce fresh ETag header after a collection's contents change by adding
+    ActiveRecord::Relation#cache_key_with_version. This method will be used by
+    ActionController::ConditionalGet to ensure that when collection cache versioning
+    is enabled, requests using ConditionalGet don't return the same ETag header
+    after a collection is modified.
+
+    Fixes #38078.
+
+    *Aaron Lipman*
+
+*   Skip test database when running `db:create` or `db:drop` in development
+    with `DATABASE_URL` set.
+
+    *Brian Buchalter*
+
+*   Don't allow mutations on the database configurations hash.
+
+    Freeze the configurations hash to disallow directly changing it. If applications need to change the hash, for example to create databases for parallelization, they should use the `DatabaseConfig` object directly.
+
+    Before:
+
+    ```ruby
+    @db_config = ActiveRecord::Base.configurations.configs_for(env_name: "test", spec_name: "primary")
+    @db_config.configuration_hash.merge!(idle_timeout: "0.02")
+    ```
+
+    After:
+
+    ```ruby
+    @db_config = ActiveRecord::Base.configurations.configs_for(env_name: "test", spec_name: "primary")
+    config = @db_config.configuration_hash.merge(idle_timeout: "0.02")
+    db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(@db_config.env_name, @db_config.spec_name, config)
+    ```
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Remove `:connection_id` from the `sql.active_record` notification.
+
+    *Aaron Patterson*, *Rafael Mendonça França*
+
+*   The `:name` key will no longer be returned as part of `DatabaseConfig#configuration_hash`. Please use `DatabaseConfig#owner_name` instead.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   ActiveRecord's `belongs_to_required_by_default` flag can now be set per model.
+
+    You can now opt-out/opt-in specific models from having their associations required
+    by default.
+
+    This change is meant to ease the process of migrating all your models to have
+    their association required.
+
+    *Edouard Chin*
+
+*   The `connection_config` method has been deprecated, please use `connection_db_config` instead which will return a `DatabaseConfigurations::DatabaseConfig` instead of a `Hash`.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Retain explicit selections on the base model after applying `includes` and `joins`.
+
+    Resolves #34889.
+
+    *Patrick Rebsch*
+
+*   The `database` kwarg is deprecated without replacement because it can't be used for sharding and creates an issue if it's used during a request. Applications that need to create new connections should use `connects_to` instead.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Allow attributes to be fetched from Arel node groupings.
+
+    *Jeff Emminger*, *Gannon McGibbon*
+
+*   A database URL can now contain a querystring value that contains an equal sign. This is needed to support passing PostgreSQL `options`.
+
+    *Joshua Flanagan*
+
+*   Calling methods like `establish_connection` with a `Hash` which is invalid (eg: no `adapter`) will now raise an error the same way as connections defined in `config/database.yml`.
+
+    *John Crepezzi*
+
+*   Specifying `implicit_order_column` now subsorts the records by primary key if available to ensure deterministic results.
+
+    *Paweł Urbanek*
+
+*   `where(attr => [])` now loads an empty result without making a query.
+
+    *John Hawthorn*
+
+*   Fixed the performance regression for `primary_keys` introduced MySQL 8.0.
+
+    *Hiroyuki Ishii*
+
+*   Add support for `belongs_to` to `has_many` inversing.
+
+    *Gannon McGibbon*
+
+*   Allow length configuration for `has_secure_token` method. The minimum length
+    is set at 24 characters.
+
+    Before:
+
+    ```ruby
+    has_secure_token :auth_token
+    ```
+
+    After:
+
+    ```ruby
+    has_secure_token :default_token             # 24 characters
+    has_secure_token :auth_token, length: 36    # 36 characters
+    has_secure_token :invalid_token, length: 12 # => ActiveRecord::SecureToken::MinimumLengthError
+    ```
+
+    *Bernardo de Araujo*
+
+*   Deprecate `DatabaseConfigurations#to_h`. These connection hashes are still available via `ActiveRecord::Base.configurations.configs_for`.
+
+    *Eileen Uchitelle*, *John Crepezzi*
+
+*   Add `DatabaseConfig#configuration_hash` to return database configuration hashes with symbol keys, and use all symbol-key configuration hashes internally. Deprecate `DatabaseConfig#config` which returns a String-keyed `Hash` with the same values.
+
+    *John Crepezzi*, *Eileen Uchitelle*
+
+*   Allow column names to be passed to `remove_index` positionally along with other options.
+
+    Passing other options can be necessary to make `remove_index` correctly reversible.
+
+    Before:
+
+        add_index    :reports, :report_id               # => works
+        add_index    :reports, :report_id, unique: true # => works
+        remove_index :reports, :report_id               # => works
+        remove_index :reports, :report_id, unique: true # => ArgumentError
+
+    After:
+
+        remove_index :reports, :report_id, unique: true # => works
+
+    *Eugene Kenny*
+
+*   Allow bulk `ALTER` statements to drop and recreate indexes with the same name.
+
+    *Eugene Kenny*
+
+*   `insert`, `insert_all`, `upsert`, and `upsert_all` now clear the query cache.
+
+    *Eugene Kenny*
+
+*   Call `while_preventing_writes` directly from `connected_to`.
+
+    In some cases application authors want to use the database switching middleware and make explicit calls with `connected_to`. It's possible for an app to turn off writes and not turn them back on by the time we call `connected_to(role: :writing)`.
+
+    This change allows apps to fix this by assuming if a role is writing we want to allow writes, except in the case it's explicitly turned off.
+
+    *Eileen M. Uchitelle*
+
+*   Improve detection of ActiveRecord::StatementTimeout with mysql2 adapter in the edge case when the query is terminated during filesort.
+
+    *Kir Shatrov*
+
+*   Stop trying to read yaml file fixtures when loading Active Record fixtures.
+
+    *Gannon McGibbon*
+
+*   Deprecate `.reorder(nil)` with `.first` / `.first!` taking non-deterministic result.
+
+    To continue taking non-deterministic result, use `.take` / `.take!` instead.
+
+    *Ryuta Kamizono*
+
+*   Preserve user supplied joins order as much as possible.
+
+    Fixes #36761, #34328, #24281, #12953.
+
+    *Ryuta Kamizono*
+
+*   Allow `matches_regex` and `does_not_match_regexp` on the MySQL Arel visitor.
+
+    *James Pearson*
+
+*   Allow specifying fixtures to be ignored by setting `ignore` in YAML file's '_fixture' section.
+
+    *Tongfei Gao*
+
+*   Make the DATABASE_URL env variable only affect the primary connection. Add new env variables for multiple databases.
+
+    *John Crepezzi*, *Eileen Uchitelle*
+
+*   Add a warning for enum elements with 'not_' prefix.
+
+        class Foo
+          enum status: [:sent, :not_sent]
+        end
+
+    *Edu Depetris*
+
+*   Make currency symbols optional for money column type in PostgreSQL.
+
+    *Joel Schneider*
+
+*   Add support for beginless ranges, introduced in Ruby 2.7.
+
+    *Josh Goodall*
+
+*   Add `database_exists?` method to connection adapters to check if a database exists.
+
+    *Guilherme Mansur*
+
+*   Loading the schema for a model that has no `table_name` raises a `TableNotSpecified` error.
+
+    *Guilherme Mansur*, *Eugene Kenny*
+
+*   PostgreSQL: Fix GROUP BY with ORDER BY virtual count attribute.
+
+    Fixes #36022.
+
+    *Ryuta Kamizono*
+
+*   Make ActiveRecord `ConnectionPool.connections` method thread-safe.
+
+    Fixes #36465.
+
+    *Jeff Doering*
+
+*   Add support for multiple databases to `rails db:abort_if_pending_migrations`.
+
+    *Mark Lee*
+
+*   Fix sqlite3 collation parsing when using decimal columns.
+
+    *Martin R. Schuster*
+
+*   Fix invalid schema when primary key column has a comment.
+
+    Fixes #29966.
+
+    *Guilherme Goettems Schneider*
+
+*   Fix table comment also being applied to the primary key column.
+
+    *Guilherme Goettems Schneider*
+
+*   Allow generated `create_table` migrations to include or skip timestamps.
+
+    *Michael Duchemin*
+
 
-Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/activerecord/CHANGELOG.md) for previous changes.
+Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/activerecord/CHANGELOG.md) for previous changes.