activerecord 5.2.8.1 → 6.1.6.1

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 5.2.8.1 (July 12, 2022) ##
+## Rails 6.1.6.1 (July 12, 2022) ##
 
 *   Change ActiveRecord::Coders::YAMLColumn default to safe_load
 
@@ -26,1059 +26,1718 @@
     [CVE-2022-32224]
 
 
-## Rails 5.2.8 (May 09, 2022) ##
+## Rails 6.1.5.1 (April 26, 2022) ##
 
 *   No changes.
 
 
-## Rails 5.2.7.1 (April 26, 2022) ##
+## Rails 6.1.5 (March 09, 2022) ##
 
-*   No changes.
+*   Fix `ActiveRecord::ConnectionAdapters::SchemaCache#deep_deduplicate` for Ruby 2.6.
 
+    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.
 
-## Rails 5.2.7 (March 10, 2022) ##
+    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.
 
-*   No changes.
+    Fixes #43056
 
+    *Eric O'Hanlon*
 
-## Rails 5.2.6.3 (March 08, 2022) ##
+*   Fix migration compatibility to create SQLite references/belongs_to column as integer when
+    migration version is 6.0.
 
-*   No changes.
+    `reference`/`belongs_to` in migrations with version 6.0 were creating columns as
+    bigint instead of integer for the SQLite Adapter.
 
+    *Marcelo Lauxen*
 
-## Rails 5.2.6.2 (February 11, 2022) ##
+*   Fix dbconsole for 3-tier config.
 
-*   No changes.
+    *Eileen M. Uchitelle*
 
+*   Better handle SQL queries with invalid encoding.
 
-## Rails 5.2.6.1 (February 11, 2022) ##
+    ```ruby
+    Post.create(name: "broken \xC8 UTF-8")
+    ```
 
-*   No changes.
+    Would cause all adapters to fail in a non controlled way in the code
+    responsible to detect write queries.
 
+    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.
 
-## Rails 5.2.6 (May 05, 2021) ##
+    *Jean Boussier*
 
-*   No changes.
+*   Ignore persisted in-memory records when merging target lists.
 
+    *Kevin Sjöberg*
 
-## Rails 5.2.5 (March 26, 2021) ##
+*   Fix regression bug that caused ignoring additional conditions for preloading
+    `has_many` through relations.
 
-*   No changes.
+    Fixes #43132
 
+    *Alexander Pauly*
 
-## Rails 5.2.4.6 (May 05, 2021) ##
+*   Fix `ActiveRecord::InternalMetadata` to not be broken by
+    `config.active_record.record_timestamps = false`
 
-*   No changes.
+    Since the model always create the timestamp columns, it has to set them, otherwise it breaks
+    various DB management tasks.
 
+    Fixes #42983
 
-## Rails 5.2.4.5 (February 10, 2021) ##
+    *Jean Boussier*
 
-*   Fix possible DoS vector in PostgreSQL money type
+*   Fix duplicate active record objects on `inverse_of`.
 
-    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.
+    *Justin Carvalho*
 
-    Thanks to @dee-see from Hackerone for this patch!
+*   Fix duplicate objects stored in has many association after save.
 
-    [CVE-2021-22880]
+    Fixes #42549.
 
-    *Aaron Patterson*
+    *Alex Ghiculescu*
+
+*   Fix performance regression in `CollectionAssocation#build`.
+
+    *Alex Ghiculescu*
 
+*   Fix retrieving default value for text column for MariaDB.
+
+    *fatkodima*
 
-## Rails 5.2.4.4 (September 09, 2020) ##
+
+## Rails 6.1.4.7 (March 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 5.2.4.3 (May 18, 2020) ##
+## Rails 6.1.4.6 (February 11, 2022) ##
 
 *   No changes.
 
-## Rails 5.2.4.2 (March 19, 2020) ##
+
+## Rails 6.1.4.5 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 5.2.4.1 (December 18, 2019) ##
+## Rails 6.1.4.4 (December 15, 2021) ##
 
 *   No changes.
 
 
-## Rails 5.2.4 (November 27, 2019) ##
+## Rails 6.1.4.3 (December 14, 2021) ##
 
-*   Fix circular `autosave: true` causes invalid records to be saved.
+*   No changes.
 
-    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`.
 
-    Fixes #28080.
+## Rails 6.1.4.2 (December 14, 2021) ##
 
-    *Larry Reid*
+*   No changes.
 
-*   PostgreSQL: Fix GROUP BY with ORDER BY virtual count attribute.
 
-    Fixes #36022.
+## Rails 6.1.4.1 (August 19, 2021) ##
 
-    *Ryuta Kamizono*
+*   No changes.
 
-*   Fix sqlite3 collation parsing when using decimal columns.
 
-    *Martin R. Schuster*
+## Rails 6.1.4 (June 24, 2021) ##
 
-*   Make ActiveRecord `ConnectionPool.connections` method thread-safe.
+*   Do not try to rollback transactions that failed due to a `ActiveRecord::TransactionRollbackError`.
 
-    Fixes #36465.
+    *Jamie McCarthy*
 
-    *Jeff Doering*
+*   Raise an error if `pool_config` is `nil` in `set_pool_config`.
 
-*   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.
+    *Eileen M. Uchitelle*
+
+*   Fix compatibility with `psych >= 4`.
 
-    Fixes #33249.
+    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.
 
-    *Ryan H. Kerr*
+    *Jean Boussier*
 
+*   Support using replicas when using `rails dbconsole`.
 
-## Rails 5.2.3 (March 27, 2019) ##
+    *Christopher Thornton*
 
-*   Fix different `count` calculation when using `size` with manual `select` with DISTINCT.
+*   Restore connection pools after transactional tests.
 
-    Fixes #35214.
+    *Eugene Kenny*
 
-    *Juani Villarejo*
+*   Change `upsert_all` to fails cleanly for MySQL when `:unique_by` is used.
 
-*   Fix prepared statements caching to be enabled even when query caching is enabled.
+    *Bastian Bartmann*
 
-    *Ryuta Kamizono*
+*   Fix user-defined `self.default_scope` to respect table alias.
 
-*   Don't allow `where` with invalid value matches to nil values.
+    *Ryuta Kamizono*
 
-    Fixes #33624.
+*   Clear `@cache_keys` cache after `update_all`, `delete_all`, `destroy_all`.
 
     *Ryuta Kamizono*
 
-*   Restore an ability that class level `update` without giving ids.
+*   Changed Arel predications `contains` and `overlaps` to use
+    `quoted_node` so that PostgreSQL arrays are quoted properly.
+
+    *Bradley Priest*
 
-    Fixes #34743.
+*   Fix `merge` when the `where` clauses have string contents.
 
     *Ryuta Kamizono*
 
-*   Fix join table column quoting with SQLite.
+*   Fix rollback of parent destruction with nested `dependent: :destroy`.
 
-    *Gannon McGibbon*
+    *Jacopo Beschi*
 
-*   Ensure that `delete_all` on collection proxy returns affected count.
+*   Fix binds logging for `"WHERE ... IN ..."` statements.
 
-    *Ryuta Kamizono*
+    *Ricardo Díaz*
 
-*   Reset scope after delete on collection association to clear stale offsets of removed records.
+*   Handle `false` in relation strict loading checks.
 
-    *Gannon McGibbon*
+    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.
+
+    ```
+    class Dog < ActiveRecord::Base
+      self.strict_loading_by_default = true
 
+      has_many :treats, strict_loading: false
+    end
+    ```
 
-## Rails 5.2.2.1 (March 11, 2019) ##
+    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.
 
-*   No changes.
+    *Eileen M. Uchitelle*, *Radamés Roriz*
 
+*   Fix numericality validator without precision.
 
-## Rails 5.2.2 (December 04, 2018) ##
+    *Ryuta Kamizono*
 
-*   Do not ignore the scoping with query methods in the scope block.
+*   Fix aggregate attribute on Enum types.
 
     *Ryuta Kamizono*
 
-*   Allow aliased attributes to be used in `#update_columns` and `#update`.
+*   Fix `CREATE INDEX` statement generation for PostgreSQL.
 
-    *Gannon McGibbon*
+    *eltongo*
 
-*   Allow spaces in postgres table names.
+*   Fix where clause on enum attribute when providing array of strings.
 
-    Fixes issue where "user post" is misinterpreted as "\"user\".\"post\"" when quoting table names with the postgres
-    adapter.
+    *Ryuta Kamizono*
 
-    *Gannon McGibbon*
+*   Fix `unprepared_statement` to work it when nesting.
 
-*   Cached columns_hash fields should be excluded from ResultSet#column_types
+    *Ryuta Kamizono*
 
-    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:
 
-    ```ruby
-    class DeveloperName < ActiveRecord::Type::String
-      def deserialize(value)
-        "Developer: #{value}"
-      end
-    end
+## Rails 6.1.3.2 (May 05, 2021) ##
 
-    class AttributedDeveloper < ActiveRecord::Base
-      self.table_name = "developers"
+*   No changes.
 
-      attribute :name, DeveloperName.new
 
-      self.ignored_columns += ["name"]
-    end
+## Rails 6.1.3.1 (March 26, 2021) ##
 
-    developer = AttributedDeveloper.create
-    developer.update_column :name, "name"
+*   No changes.
 
-    loaded_developer = AttributedDeveloper.where(id: developer.id).select("*").first
-    puts loaded_developer.name # should be "Developer: name" but it's just "name"
-    ```
 
-    *Dmitry Tsepelev*
+## Rails 6.1.3 (February 17, 2021) ##
 
-*   Values of enum are frozen, raising an error when attempting to modify them.
+*   Fix the MySQL adapter to always set the right collation and charset
+    to the connection session.
 
-    *Emmanuel Byrd*
+    *Rafael Mendonça França*
 
-*   `update_columns` now correctly raises `ActiveModel::MissingAttributeError`
-    if the attribute does not exist.
+*   Fix MySQL adapter handling of time objects when prepared statements
+    are enabled.
 
-    *Sean Griffin*
+    *Rafael Mendonça França*
 
-*   Do not use prepared statement in queries that have a large number of binds.
+*   Fix scoping in enum fields using conditions that would generate
+    an `IN` clause.
 
     *Ryuta Kamizono*
 
-*   Fix query cache to load before first request.
+*   Skip optimised #exist? query when #include? is called on a relation
+    with a having clause
 
-    *Eileen M. Uchitelle*
+    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.
 
-*   Fix collection cache key with limit and custom select to avoid ambiguous timestamp column error.
+    An sample query affected by this problem:
 
-    Fixes #33056.
+    ```ruby
+    Author.select('COUNT(*) as total_posts', 'authors.*')
+          .joins(:posts)
+          .group(:id)
+          .having('total_posts > 2')
+          .include?(Author.first)
+    ```
 
-    *Federico Martinez*
+    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.
 
-*   Fix duplicated record creation when using nested attributes with `create_with`.
+    Fixes #41417
 
-    *Darwin Wu*
+    *Michael Smart*
 
-*   Fix regression setting children record in parent `before_save` callback.
+*   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.
 
-    *Guo Xiang Tan*
+    *wbharding*, *Martin Tepper*
 
-*   Prevent leaking of user's DB credentials on `rails db:create` failure.
 
-    *bogdanvlviv*
+## Rails 6.1.2.1 (February 10, 2021) ##
 
-*   Clear mutation tracker before continuing the around callbacks.
+*   Fix possible DoS vector in PostgreSQL money type
+
+    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.
 
-    *Yuya Tanaka*
+    Thanks to @dee-see from Hackerone for this patch!
 
-*   Prevent deadlocks when waiting for connection from pool.
+    [CVE-2021-22880]
 
-    *Brent Wheeldon*
+    *Aaron Patterson*
 
-*   Avoid extra scoping when using `Relation#update` that was causing this method to change the current scope.
 
-    *Ryuta Kamizono*
+## Rails 6.1.2 (February 09, 2021) ##
 
-*   Fix numericality validator not to be affected by custom getter.
+*   Fix timestamp type for sqlite3.
 
-    *Ryuta Kamizono*
+    *Eileen M. Uchitelle*
 
-*   Fix bulk change table ignores comment option on PostgreSQL.
+*   Make destroy async transactional.
 
-    *Yoshiyuki Kinjo*
+    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.
 
+    Now the jobs are only enqueued until after the db transaction has been committed.
 
-## Rails 5.2.1.1 (November 27, 2018) ##
+    *Cory Gwin*
 
-*   No changes.
+*   Fix malformed packet error in MySQL statement for connection configuration.
 
+    *robinroestenburg*
 
-## Rails 5.2.1 (August 07, 2018) ##
+*   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.
 
-*   PostgreSQL: Support new relkind for partitioned tables.
+    Fixes #41137.
 
-    Fixes #33008.
+    *Jonathan Bracy*
 
-    *Yannick Schutz*
+*   Fix granular connection swapping when there are multiple abstract classes.
 
-*   Rollback parent transaction when children fails to update.
+    *Eileen M. Uchitelle*
+
+*   Fix `find_by` with custom primary key for belongs_to association.
 
-    *Guillaume Malette*
+    *Ryuta Kamizono*
 
-*   Fix default value for MySQL time types with specified precision.
+*   Add support for `rails console --sandbox` for multiple database applications.
 
-    *Nikolay Kondratyev*
+    *alpaca-tc*
 
-*   Fix `touch` option to behave consistently with `Persistence#touch` method.
+*   Fix `where` on polymorphic association with empty array.
 
     *Ryuta Kamizono*
 
-*   Fix `save` in `after_create_commit` won't invoke extra `after_create_commit`.
+*   Fix preventing writes for `ApplicationRecord`.
+
+    *Eileen M. Uchitelle*
+
+
+## Rails 6.1.1 (January 07, 2021) ##
+
+*   Fix fixtures loading when strict loading is enabled for the association.
 
-    Fixes #32831.
+    *Alex Ghiculescu*
+
+*   Fix `where` with custom primary key for belongs_to association.
 
     *Ryuta Kamizono*
 
-*   Fix logic on disabling commit callbacks so they are not called unexpectedly when errors occur.
+*   Fix `where` with aliased associations.
 
-    *Brian Durand*
+    *Ryuta Kamizono*
 
-*   Fix parent record should not get saved with duplicate children records.
+*   Fix `composed_of` with symbol mapping.
 
-    Fixes #32940.
+    *Ryuta Kamizono*
 
-    *Santosh Wadghule*
+*   Don't skip money's type cast for pluck and calculations.
 
-*   Fix that association's after_touch is not called with counter cache.
+    *Ryuta Kamizono*
 
-    Fixes #31559.
+*   Fix `where` on polymorphic association with non Active Record object.
 
     *Ryuta Kamizono*
 
-*   `becomes` should clear the mutation tracker which is created in `after_initialize`.
+*   Make sure `db:prepare` works even the schema file doesn't exist.
 
-    Fixes #32867.
+    *Rafael Mendonça França*
+
+*   Fix complicated `has_many :through` with nested where condition.
 
     *Ryuta Kamizono*
 
-*   Allow a belonging to parent object to be created from a new record.
+*   Handle STI models for `has_many dependent: :destroy_async`.
 
-    *Jolyon Pawlyn*
+    *Muhammad Usman*
 
-*   Fix that building record with assigning multiple has_one associations
-    wrongly persists through record.
+*   Restore possibility of passing `false` to :polymorphic option of `belongs_to`.
 
-    Fixes #32511.
+    Previously, passing `false` would trigger the option validation logic
+    to throw an error saying :polymorphic would not be a valid option.
 
-    *Sam DeCesare*
+    *glaszig*
 
-*   Fix relation merging when one of the relations is going to skip the
-    query cache.
+*   Allow adding nonnamed expression indexes to be revertible.
 
-    *James Williams*
+    Fixes #40732.
 
+    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.
 
-## Rails 5.2.0 (April 09, 2018) ##
+    ```ruby
+    add_index(:items, "to_tsvector('english', description)")
+    ```
 
-*   MySQL: Support mysql2 0.5.x.
+    *fatkodima*
 
-    *Aaron Stone*
 
-*   Apply time column precision on assignment.
+## Rails 6.1.0 (December 09, 2020) ##
 
-    PR #20317 changed the behavior of datetime columns so that when they
-    have a specified precision then on assignment the value is rounded to
-    that precision. This behavior is now applied to time columns as well.
+*   Only warn about negative enums if a positive form that would cause conflicts exists.
 
-    Fixes #30301.
+    Fixes #39065.
 
-    *Andrew White*
+    *Alex Ghiculescu*
 
-*   Normalize time column values for SQLite database.
+*   Change `attribute_for_inspect` to take `filter_attributes` in consideration.
 
-    For legacy reasons, time columns in SQLite are stored as full datetimes
-    because until #24542 the quoting for time columns didn't remove the date
-    component. To ensure that values are consistent we now normalize the
-    date component to 2001-01-01 on reading and writing.
+    *Rafael Mendonça França*
 
-    *Andrew White*
+*   Fix odd behavior of inverse_of with multiple belongs_to to same class.
 
-*   Ensure that the date component is removed when quoting times.
+    Fixes #35204.
 
-    PR #24542 altered the quoting for time columns so that the date component
-    was removed however it only removed it when it was 2001-01-01. Now the
-    date component is removed irrespective of what the date is.
+    *Tomoyuki Kai*
 
-    *Andrew White*
+*   Build predicate conditions with objects that delegate `#id` and primary key:
 
-*   Fix `dependent: :destroy` issue for has_one/belongs_to relationship where
-    the parent class was getting deleted when the child was not.
+    ```ruby
+    class AdminAuthor
+      delegate_missing_to :@author
 
-    Fixes #32022.
+      def initialize(author)
+        @author = author
+      end
+    end
 
-    *Fernando Gorodscy*
+    Post.where(author: AdminAuthor.new(author))
+    ```
 
-*   Whitelist `NULLS FIRST` and `NULLS LAST` in order clauses too.
+    *Sean Doyle*
 
-    *Xavier Noria*
+*   Add `connected_to_many` API.
 
-*   Fix that after commit callbacks on update does not triggered when optimistic locking is enabled.
+    This API allows applications to connect to multiple databases at once without switching all of them or implementing a deeply nested stack.
 
-    *Ryuta Kamizono*
+    Before:
 
-*   Fix `#columns_for_distinct` of MySQL and PostgreSQL to make
-    `ActiveRecord::FinderMethods#limited_ids_for` use correct primary key values
-    even if `ORDER BY` columns include other table's primary key.
+        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
 
-    Fixes #28364.
+    After:
 
-    *Takumi Kagiyama*
+        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
 
-*   Make `reflection.klass` raise if `polymorphic?` not to be misused.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    Fixes #31876.
+*   Add option to raise or log for `ActiveRecord::StrictLoadingViolationError`.
 
-    *Ryuta Kamizono*
+    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.
 
-*   PostgreSQL: Allow pg-1.0 gem to be used with Active Record.
+    Set `config.active_record.action_on_strict_loading_violation` to `:log` errors instead of raising.
 
-    *Lars Kanis*
+    *Eileen M. Uchitelle*
 
-*   Deprecate `expand_hash_conditions_for_aggregates` without replacement.
-    Using a `Relation` for performing queries is the prefered API.
+*   Allow the inverse of a `has_one` association that was previously autosaved to be loaded.
 
-    *Ryuta Kamizono*
+    Fixes #34255.
 
-*   Fix not expanded problem when passing an Array object as argument to the where method using `composed_of` column.
+    *Steven Weber*
 
-    ```
-    david_balance = customers(:david).balance
-    Customer.where(balance: [david_balance]).to_sql
+*   Optimise the length of index names for polymorphic references by using the reference name rather than the type and id column names.
 
-    # Before: WHERE `customers`.`balance` = NULL
-    # After : WHERE `customers`.`balance` = 50
-    ```
+    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.
 
-    Fixes #31723.
+    This change reduces the chance of that happening by using the reference name, e.g. `index_my_table_on_my_reference`.
 
-    *Yutaro Kanagawa*
+    Fixes #38655.
 
-*   Fix `count(:all)` with eager loading and having an order other than the driving table.
+    *Luke Redpath*
 
-    Fixes #31783.
+*   MySQL: Uniqueness validator now respects default database collation,
+    no longer enforce case sensitive comparison by default.
 
     *Ryuta Kamizono*
 
-*   Clear the transaction state when an Active Record object is duped.
+*   Remove deprecated methods from `ActiveRecord::ConnectionAdapters::DatabaseLimits`.
 
-    Fixes #31670.
+    `column_name_length`
+    `table_name_length`
+    `columns_per_table`
+    `indexes_per_table`
+    `columns_per_multicolumn_index`
+    `sql_query_length`
+    `joins_per_query`
 
-    *Yuriy Ustushenko*
+    *Rafael Mendonça França*
 
-*   Support for PostgreSQL foreign tables.
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::AbstractAdapter#supports_multi_insert?`.
 
-    *fatkodima*
+    *Rafael Mendonça França*
+
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::AbstractAdapter#supports_foreign_keys_in_create?`.
 
-*   Fix relation merger issue with `left_outer_joins`.
+    *Rafael Mendonça França*
+
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::PostgreSQLAdapter#supports_ranges?`.
 
-    *Mehmet Emin İNAÇ*
+    *Rafael Mendonça França*
 
-*   Don't allow destroyed object mutation after `save` or `save!` is called.
+*   Remove deprecated `ActiveRecord::Base#update_attributes` and `ActiveRecord::Base#update_attributes!`.
 
-    *Ryuta Kamizono*
+    *Rafael Mendonça França*
 
-*   Take into account association conditions when deleting through records.
+*   Remove deprecated `migrations_path` argument in `ActiveRecord::ConnectionAdapter::SchemaStatements#assume_migrated_upto_version`.
 
-    Fixes #18424.
+    *Rafael Mendonça França*
 
-    *Piotr Jakubowski*
+*   Remove deprecated `config.active_record.sqlite3.represent_boolean_as_integer`.
 
-*   Fix nested `has_many :through` associations on unpersisted parent instances.
+    *Rafael Mendonça França*
 
-    For example, if you have
+*   `relation.create` does no longer leak scope to class level querying methods
+    in initialization block and callbacks.
 
-        class Post < ActiveRecord::Base
-          belongs_to :author
-          has_many :books, through: :author
-          has_many :subscriptions, through: :books
-        end
+    Before:
 
-        class Author < ActiveRecord::Base
-          has_one :post
-          has_many :books
-          has_many :subscriptions, through: :books
+        User.where(name: "John").create do |john|
+          User.find_by(name: "David") # => nil
         end
 
-        class Book < ActiveRecord::Base
-          belongs_to :author
-          has_many :subscriptions
+    After:
+
+        User.where(name: "John").create do |john|
+          User.find_by(name: "David") # => #<User name: "David", ...>
         end
 
-        class Subscription < ActiveRecord::Base
-          belongs_to :book
+    *Ryuta Kamizono*
+
+*   Named scope chain does no longer leak scope to class level querying methods.
+
+        class User < ActiveRecord::Base
+          scope :david, -> { User.where(name: "David") }
         end
 
     Before:
 
-    If `post` is not persisted, then `post.subscriptions` will be empty.
+        User.where(name: "John").david
+        # SELECT * FROM users WHERE name = 'John' AND name = 'David'
 
     After:
 
-    If `post` is not persisted, then `post.subscriptions` can be set and used
-    just like it would if `post` were persisted.
+        User.where(name: "John").david
+        # SELECT * FROM users WHERE name = 'David'
 
-    Fixes #16313.
+    *Ryuta Kamizono*
 
-    *Zoltan Kiss*
+*   Remove deprecated methods from `ActiveRecord::DatabaseConfigurations`.
 
-*   Fixed inconsistency with `first(n)` when used with `limit()`.
-    The `first(n)` finder now respects the `limit()`, making it consistent
-    with `relation.to_a.first(n)`, and also with the behavior of `last(n)`.
+    `fetch`
+    `each`
+    `first`
+    `values`
+    `[]=`
 
-    Fixes #23979.
+    *Rafael Mendonça França*
 
-    *Brian Christian*
+*   `where.not` now generates NAND predicates instead of NOR.
 
-*   Use `count(:all)` in `HasManyAssociation#count_records` to prevent invalid
-    SQL queries for association counting.
+     Before:
 
-    *Klas Eskilson*
+        User.where.not(name: "Jon", role: "admin")
+        # SELECT * FROM users WHERE name != 'Jon' AND role != 'admin'
 
-*   Fix to invoke callbacks when using `update_attribute`.
+     After:
 
-    *Mike Busch*
+        User.where.not(name: "Jon", role: "admin")
+        # SELECT * FROM users WHERE NOT (name == 'Jon' AND role == 'admin')
 
-*   Fix `count(:all)` to correctly work `distinct` with custom SELECT list.
+    *Rafael Mendonça França*
 
-    *Ryuta Kamizono*
+*   Remove deprecated `ActiveRecord::Result#to_hash` method.
 
-*   Using subselect for `delete_all` with `limit` or `offset`.
+    *Rafael Mendonça França*
 
-    *Ryuta Kamizono*
+*   Deprecate `ActiveRecord::Base.allow_unsafe_raw_sql`.
 
-*   Undefine attribute methods on descendants when resetting column
-    information.
+    *Rafael Mendonça França*
 
-    *Chris Salzberg*
+*   Remove deprecated support for using unsafe raw SQL in `ActiveRecord::Relation` methods.
 
-*   Log database query callers.
+    *Rafael Mendonça França*
 
-    Add `verbose_query_logs` configuration option to display the caller
-    of database queries in the log to facilitate N+1 query resolution
-    and other debugging.
+*   Allow users to silence the "Rails couldn't infer whether you are using multiple databases..."
+    message using `config.active_record.suppress_multiple_database_warning`.
 
-    Enabled in development only for new and upgraded applications. Not
-    recommended for use in the production environment since it relies
-    on Ruby's `Kernel#caller_locations` which is fairly slow.
+    *Omri Gabay*
 
-    *Olivier Lacan*
+*   Connections can be granularly switched for abstract classes when `connected_to` is called.
 
-*   Fix conflicts `counter_cache` with `touch: true` by optimistic locking.
+    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.
 
-    ```
-    # create_table :posts do |t|
-    #   t.integer :comments_count, default: 0
-    #   t.integer :lock_version
-    #   t.timestamps
-    # end
-    class Post < ApplicationRecord
-    end
+    Example usage:
 
-    # create_table :comments do |t|
-    #   t.belongs_to :post
-    # end
-    class Comment < ApplicationRecord
-      belongs_to :post, touch: true, counter_cache: true
-    end
-    ```
+    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`.
 
-    Before:
-    ```
-    post = Post.create!
-    # => begin transaction
-         INSERT INTO "posts" ("created_at", "updated_at", "lock_version")
-         VALUES ("2017-12-11 21:27:11.387397", "2017-12-11 21:27:11.387397", 0)
-         commit transaction
-
-    comment = Comment.create!(post: post)
-    # => begin transaction
-         INSERT INTO "comments" ("post_id") VALUES (1)
-
-         UPDATE "posts" SET "comments_count" = COALESCE("comments_count", 0) + 1,
-         "lock_version" = COALESCE("lock_version", 0) + 1 WHERE "posts"."id" = 1
-
-         UPDATE "posts" SET "updated_at" = '2017-12-11 21:27:11.398330',
-         "lock_version" = 1 WHERE "posts"."id" = 1 AND "posts"."lock_version" = 0
-         rollback transaction
-    # => ActiveRecord::StaleObjectError: Attempted to touch a stale object: Post.
-
-    Comment.take.destroy!
-    # => begin transaction
-         DELETE FROM "comments" WHERE "comments"."id" = 1
-
-         UPDATE "posts" SET "comments_count" = COALESCE("comments_count", 0) - 1,
-         "lock_version" = COALESCE("lock_version", 0) + 1 WHERE "posts"."id" = 1
-
-         UPDATE "posts" SET "updated_at" = '2017-12-11 21:42:47.785901',
-         "lock_version" = 1 WHERE "posts"."id" = 1 AND "posts"."lock_version" = 0
-         rollback transaction
-    # => ActiveRecord::StaleObjectError: Attempted to touch a stale object: Post.
-    ```
+    ```ruby
+    ActiveRecord::Base.connected_to(role: :reading) do
+      User.first # reads from default replica
+      Dog.first # reads from default replica
 
-    After:
-    ```
-    post = Post.create!
-    # => begin transaction
-         INSERT INTO "posts" ("created_at", "updated_at", "lock_version")
-         VALUES ("2017-12-11 21:27:11.387397", "2017-12-11 21:27:11.387397", 0)
-         commit transaction
-
-    comment = Comment.create!(post: post)
-    # => begin transaction
-         INSERT INTO "comments" ("post_id") VALUES (1)
-
-         UPDATE "posts" SET "comments_count" = COALESCE("comments_count", 0) + 1,
-         "lock_version" = COALESCE("lock_version", 0) + 1,
-         "updated_at" = '2017-12-11 21:37:09.802642' WHERE "posts"."id" = 1
-         commit transaction
-
-    comment.destroy!
-    # => begin transaction
-         DELETE FROM "comments" WHERE "comments"."id" = 1
-
-         UPDATE "posts" SET "comments_count" = COALESCE("comments_count", 0) - 1,
-         "lock_version" = COALESCE("lock_version", 0) + 1,
-         "updated_at" = '2017-12-11 21:39:02.685520' WHERE "posts"."id" = 1
-         commit transaction
+      AnimalsRecord.connected_to(role: :writing, shard: :one) do
+        User.first # reads from default replica
+        Dog.first # reads from shard one primary
+      end
+
+      User.first # reads from default replica
+      Dog.first # reads from default replica
+
+      ApplicationRecord.connected_to(role: :writing, shard: :two) do
+        User.first # reads from shard two primary
+        Dog.first # reads from default replica
+      end
+    end
     ```
 
-    Fixes #31199.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    *bogdanvlviv*
+*   Allow double-dash comment syntax when querying read-only databases
 
-*   Add support for PostgreSQL operator classes to `add_index`.
+    *James Adam*
 
-    Example:
+*   Add `values_at` method.
 
-        add_index :users, :name, using: :gist, opclass: { name: :gist_trgm_ops }
+    Returns an array containing the values associated with the given methods.
 
-    *Greg Navis*
+    ```ruby
+    topic = Topic.first
+    topic.values_at(:title, :author_name)
+    # => ["Budget", "Jason"]
+    ```
 
-*   Don't allow scopes to be defined which conflict with instance methods on `Relation`.
+    Similar to `Hash#values_at` but on an Active Record instance.
 
-    Fixes #31120.
+    *Guillaume Briday*
 
-    *kinnrot*
+*   Fix `read_attribute_before_type_cast` to consider attribute aliases.
 
-*   Add new error class `QueryCanceled` which will be raised
-    when canceling statement due to user request.
+    *Marcelo Lauxen*
 
-    *Ryuta Kamizono*
+*   Support passing record to uniqueness validator `:conditions` callable:
 
-*   Add `#up_only` to database migrations for code that is only relevant when
-    migrating up, e.g. populating a new column.
+    ```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
+    ```
 
-    *Rich Daley*
+    *Eliot Sykes*
 
-*   Require raw SQL fragments to be explicitly marked when used in
-    relation query methods.
+*   `BatchEnumerator#update_all` and `BatchEnumerator#delete_all` now return the
+    total number of rows affected, just like their non-batched counterparts.
 
-    Before:
-    ```
-    Article.order("LENGTH(title)")
+    ```ruby
+    Person.in_batches.update_all("first_name = 'Eugene'") # => 42
+    Person.in_batches.delete_all # => 42
     ```
 
-    After:
-    ```
-    Article.order(Arel.sql("LENGTH(title)"))
-    ```
+    Fixes #40287.
 
-    This prevents SQL injection if applications use the [strongly
-    discouraged] form `Article.order(params[:my_order])`, under the
-    mistaken belief that only column names will be accepted.
+    *Eugene Kenny*
 
-    Raw SQL strings will now cause a deprecation warning, which will
-    become an UnknownAttributeReference error in Rails 6.0. Applications
-    can opt in to the future behavior by setting `allow_unsafe_raw_sql`
-    to `:disabled`.
+*   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.
 
-    Common and judged-safe string values (such as simple column
-    references) are unaffected:
-    ```
-    Article.order("title DESC")
-    ```
+    To use this in 6.1, you need to place the next string to your model file:
 
-    *Ben Toews*
+        attribute :duration, :interval
 
-*   `update_all` will now pass its values to `Type#cast` before passing them to
-    `Type#serialize`. This means that `update_all(foo: 'true')` will properly
-    persist a boolean.
+    To keep old behavior until 7.0 is released:
 
-    *Sean Griffin*
+        attribute :duration, :string
 
-*   Add new error class `StatementTimeout` which will be raised
-    when statement timeout exceeded.
+    Example:
 
-    *Ryuta Kamizono*
+        create_table :events do |t|
+          t.string   :name
+          t.interval :duration
+        end
 
-*   Fix `bin/rails db:migrate` with specified `VERSION`.
-    `bin/rails db:migrate` with empty VERSION behaves as without `VERSION`.
-    Check a format of `VERSION`: Allow a migration version number
-    or name of a migration file. Raise error if format of `VERSION` is invalid.
-    Raise error if target migration doesn't exist.
+        class Event < ApplicationRecord
+          attribute :duration, :interval
+        end
 
-    *bogdanvlviv*
+        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
 
-*   Fixed a bug where column orders for an index weren't written to
-    `db/schema.rb` when using the sqlite adapter.
+    *Andrey Novikov*
 
-    Fixes #30902.
+*   Allow associations supporting the `dependent:` key to take `dependent: :destroy_async`.
 
-    *Paul Kuruvilla*
+    ```ruby
+    class Account < ActiveRecord::Base
+        belongs_to :supplier, dependent: :destroy_async
+    end
+    ```
 
-*   Remove deprecated method `#sanitize_conditions`.
+    `:destroy_async` will enqueue a job to destroy associated records in the background.
 
-    *Rafael Mendonça França*
+    *DHH*, *George Claghorn*, *Cory Gwin*, *Rafael Mendonça França*, *Adrianna Chang*
 
-*   Remove deprecated method `#scope_chain`.
+*   Add `SKIP_TEST_DATABASE` environment variable to disable modifying the test database when `rails db:create` and `rails db:drop` are called.
 
-    *Rafael Mendonça França*
+    *Jason Schweier*
 
-*   Remove deprecated configuration `.error_on_ignored_order_or_limit`.
+*   `connects_to` can only be called on `ActiveRecord::Base` or abstract classes.
 
-    *Rafael Mendonça França*
+    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.
 
-*   Remove deprecated arguments from `#verify!`.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    *Rafael Mendonça França*
+*   All connection adapters `execute` now raises `ActiveRecord::ConnectionNotEstablished` rather than
+    `ActiveRecord::StatementInvalid` when they encounter a connection error.
 
-*   Remove deprecated argument `name` from `#indexes`.
+    *Jean Boussier*
 
-    *Rafael Mendonça França*
+*   `Mysql2Adapter#quote_string` now raises `ActiveRecord::ConnectionNotEstablished` rather than
+    `ActiveRecord::StatementInvalid` when it can't connect to the MySQL server.
 
-*   Remove deprecated method `ActiveRecord::Migrator.schema_migrations_table_name`.
+    *Jean Boussier*
 
-    *Rafael Mendonça França*
+*   Add support for check constraints that are `NOT VALID` via `validate: false` (PostgreSQL-only).
 
-*   Remove deprecated method `supports_primary_key?`.
+    *Alex Robbin*
 
-    *Rafael Mendonça França*
+*   Ensure the default configuration is considered primary or first for an environment
 
-*   Remove deprecated method `supports_migrations?`.
+    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.
 
-    *Rafael Mendonça França*
+    *Eileen M. Uchitelle*
 
-*   Remove deprecated methods `initialize_schema_migrations_table` and `initialize_internal_metadata_table`.
+*   Allow `where` references association names as joined table name aliases.
 
-    *Rafael Mendonça França*
+    ```ruby
+    class Comment < ActiveRecord::Base
+      enum label: [:default, :child]
+      has_many :children, class_name: "Comment", foreign_key: :parent_id
+    end
 
-*   Raises when calling `lock!` in a dirty record.
+    # ... FROM comments LEFT OUTER JOIN comments children ON ... WHERE children.label = 1
+    Comment.includes(:children).where("children.label": "child")
+    ```
 
-    *Rafael Mendonça França*
+    *Ryuta Kamizono*
 
-*   Remove deprecated support to passing a class to `:class_name` on associations.
+*   Support storing demodulized class name for polymorphic type.
 
-    *Rafael Mendonça França*
+    Before Rails 6.1, storing demodulized class name is supported only for STI type
+    by `store_full_sti_class` class attribute.
 
-*   Remove deprecated argument `default` from `index_name_exists?`.
+    Now `store_full_class_name` class attribute can handle both STI and polymorphic types.
 
-    *Rafael Mendonça França*
+    *Ryuta Kamizono*
 
-*   Remove deprecated support to `quoted_id` when typecasting an Active Record object.
+*   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.
 
-    *Rafael Mendonça França*
+    *fatkodima*
 
-*   Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong
-    ar_internal_metadata's data for a test database.
+*   Respect the `select` values for eager loading.
 
-    Before:
-    ```
-    $ RAILS_ENV=test rails dbconsole
-    > SELECT * FROM ar_internal_metadata;
-    key|value|created_at|updated_at
-    environment|development|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679
+    ```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
     ```
 
-    After:
-    ```
-    $ RAILS_ENV=test rails dbconsole
-    > SELECT * FROM ar_internal_metadata;
-    key|value|created_at|updated_at
-    environment|test|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679
-    ```
+    *Ryuta Kamizono*
 
-    Fixes #26731.
+*   Allow attribute's default to be configured but keeping its own type.
 
-    *bogdanvlviv*
+    ```ruby
+    class Post < ActiveRecord::Base
+      attribute :written_at, default: -> { Time.now.utc }
+    end
 
-*   Fix longer sequence name detection for serial columns.
+    # Rails 6.0
+    Post.type_for_attribute(:written_at) # => #<Type::Value ... precision: nil, ...>
 
-    Fixes #28332.
+    # Rails 6.1
+    Post.type_for_attribute(:written_at) # => #<Type::DateTime ... precision: 6, ...>
+    ```
 
     *Ryuta Kamizono*
 
-*   MySQL: Don't lose `auto_increment: true` in the `db/schema.rb`.
+*   Allow default to be configured for Enum.
 
-    Fixes #30894.
+    ```ruby
+    class Book < ActiveRecord::Base
+      enum status: [:proposed, :written, :published], _default: :published
+    end
 
-    *Ryuta Kamizono*
+    Book.new.status # => "published"
+    ```
 
-*   Fix `COUNT(DISTINCT ...)` for `GROUP BY` with `ORDER BY` and `LIMIT`.
+    *Ryuta Kamizono*
 
-    Fixes #30886.
+*   Deprecate YAML loading from legacy format older than Rails 5.0.
 
     *Ryuta Kamizono*
 
-*   PostgreSQL `tsrange` now preserves subsecond precision.
+*   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.
 
-    PostgreSQL 9.1+ introduced range types, and Rails added support for using
-    this datatype in Active Record. However, the serialization of
-    `PostgreSQL::OID::Range` was incomplete, because it did not properly
-    cast the bounds that make up the range. This led to subseconds being
-    dropped in SQL commands:
+    *Sean Griffin*, *Ryuta Kamizono*
 
-    Before:
+*   Deprecate `map!` and `collect!` on `ActiveRecord::Result`.
+
+    *Ryuta Kamizono*
 
-        connection.type_cast(tsrange.serialize(range_value))
-        # => "[2010-01-01 13:30:00 UTC,2011-02-02 19:30:00 UTC)"
+*   Support `relation.and` for intersection as Set theory.
 
-    Now:
+    ```ruby
+    david_and_mary = Author.where(id: [david, mary])
+    mary_and_bob   = Author.where(id: [mary, bob])
 
-        connection.type_cast(tsrange.serialize(range_value))
-        # => "[2010-01-01 13:30:00.670277,2011-02-02 19:30:00.745125)"
+    david_and_mary.merge(mary_and_bob) # => [mary, bob]
 
-    *Thomas Cannon*
+    david_and_mary.and(mary_and_bob) # => [mary]
+    david_and_mary.or(mary_and_bob)  # => [david, mary, bob]
+    ```
 
-*   Passing a `Set` to `Relation#where` now behaves the same as passing an
-    array.
+    *Ryuta Kamizono*
 
-    *Sean Griffin*
+*   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)`.
 
-*   Use given algorithm while removing index from database.
+    ```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]
 
-    Fixes #24190.
+    # Rails 6.1 (both conflict conditions exists, deprecated)
+    Author.where(id: david.id..mary.id).merge(Author.where(id: bob)) # => []
 
-    *Mehmet Emin İNAÇ*
+    # 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]
 
-*   Update payload names for `sql.active_record` instrumentation to be
-    more descriptive.
+    # 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]
+    ```
 
-    Fixes #30586.
+    *Ryuta Kamizono*
 
-    *Jeremy Green*
+*   Do not mark Postgresql MAC address and UUID attributes as changed when the assigned value only varies by case.
 
-*   Add new error class `LockWaitTimeout` which will be raised
-    when lock wait timeout exceeded.
+    *Peter Fry*
 
-    *Gabriel Courtemanche*
+*   Resolve issue with insert_all unique_by option when used with expression index.
 
-*   Remove deprecated `#migration_keys`.
+    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.
 
-    *Ryuta Kamizono*
+    Usage:
 
-*   Automatically guess the inverse associations for STI.
+    ```ruby
+    create_table :books, id: :integer, force: true do |t|
+      t.column :name, :string
+      t.index "lower(name)", unique: true
+    end
 
-    *Yuichiro Kaneko*
+    Book.insert_all [{ name: "MyTest" }], unique_by: :index_books_on_lower_name
+    ```
 
-*   Ensure `sum` honors `distinct` on `has_many :through` associations.
+    Fixes #39516.
 
-    Fixes #16791.
+    *Austen Madden*
 
-    *Aaron Wortham*
+*   Add basic support for CHECK constraints to database migrations.
 
-*   Add `binary` fixture helper method.
+    Usage:
 
-    *Atsushi Yoshida*
+    ```ruby
+    add_check_constraint :products, "price > 0", name: "price_check"
+    remove_check_constraint :products, name: "price_check"
+    ```
 
-*   When using `Relation#or`, extract the common conditions and put them before the OR condition.
+    *fatkodima*
 
-    *Maxime Handfield Lapointe*
+*   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.
 
-*   `Relation#or` now accepts two relations who have different values for
-    `references` only, as `references` can be implicitly called by `where`.
+    Usage:
 
-    Fixes #29411.
+    ```ruby
+    class Developer < ApplicationRecord
+      self.strict_loading_by_default = true
 
-    *Sean Griffin*
+      has_many :projects
+    end
 
-*   `ApplicationRecord` is no longer generated when generating models. If you
-    need to generate it, it can be created with `rails g application_record`.
+    dev = Developer.first
+    dev.projects.first
+    # => ActiveRecord::StrictLoadingViolationError Exception: Developer is marked as strict_loading and Project cannot be lazily loaded.
+    ```
 
-    *Lisa Ugray*
+    *bogdanvlviv*
 
-*   Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT` to keep the existing select list.
+*   Deprecate passing an Active Record object to `quote`/`type_cast` directly.
 
     *Ryuta Kamizono*
 
-*   When a `has_one` association is destroyed by `dependent: destroy`,
-    `destroyed_by_association` will now be set to the reflection, matching the
-    behaviour of `has_many` associations.
+*   Default engine `ENGINE=InnoDB` is no longer dumped to make schema more agnostic.
 
-    *Lisa Ugray*
+    Before:
 
-*   Fix `unscoped(where: [columns])` removing the wrong bind values.
+    ```ruby
+    create_table "accounts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci", force: :cascade do |t|
+    end
+    ```
 
-    When the `where` is called on a relation after a `or`, unscoping the column of that later `where` removed
-    bind values used by the `or` instead. (possibly other cases too)
+    After:
 
-    ```
-    Post.where(id: 1).or(Post.where(id: 2)).where(foo: 3).unscope(where: :foo).to_sql
-    # Currently:
-    #     SELECT "posts".* FROM "posts" WHERE ("posts"."id" = 2 OR "posts"."id" = 3)
-    # With fix:
-    #     SELECT "posts".* FROM "posts" WHERE ("posts"."id" = 1 OR "posts"."id" = 2)
+    ```ruby
+    create_table "accounts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    end
     ```
 
-    *Maxime Handfield Lapointe*
+    *Ryuta Kamizono*
 
-*   Values constructed using multi-parameter assignment will now use the
-    post-type-cast value for rendering in single-field form inputs.
+*   Added delegated type as an alternative to single-table inheritance for representing class hierarchies.
+    See ActiveRecord::DelegatedType for the full description.
 
-    *Sean Griffin*
+    *DHH*
 
-*   `Relation#joins` is no longer affected by the target model's
-    `current_scope`, with the exception of `unscoped`.
+*   Deprecate aggregations with group by duplicated fields.
 
-    Fixes #29338.
+    To migrate to Rails 7.0's behavior, use `uniq!(:group)` to deduplicate group fields.
 
-    *Sean Griffin*
+    ```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
+    # }
+    ```
 
-*   Change sqlite3 boolean serialization to use 1 and 0.
+    *Ryuta Kamizono*
 
-    SQLite natively recognizes 1 and 0 as true and false, but does not natively
-    recognize 't' and 'f' as was previously serialized.
+*   Deprecate duplicated query annotations.
 
-    This change in serialization requires a migration of stored boolean data
-    for SQLite databases, so it's implemented behind a configuration flag
-    whose default false value is deprecated.
+    To migrate to Rails 7.0's behavior, use `uniq!(:annotate)` to deduplicate query annotations.
 
-    *Lisa Ugray*
+    ```ruby
+    accounts = Account.where(id: [1, 2]).annotate("david and mary")
 
-*   Skip query caching when working with batches of records (`find_each`, `find_in_batches`,
-    `in_batches`).
+    # duplicated annotations, deprecated.
+    accounts.merge(accounts.rewhere(id: 3))
+    # SELECT accounts.* FROM accounts WHERE accounts.id = 3 /* david and mary */ /* david and mary */
 
-    Previously, records would be fetched in batches, but all records would be retained in memory
-    until the end of the request or job.
+    # 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 */
+    ```
 
-    *Eugene Kenny*
+    *Ryuta Kamizono*
 
-*   Prevent errors raised by `sql.active_record` notification subscribers from being converted into
-    `ActiveRecord::StatementInvalid` exceptions.
+*   Resolve conflict between counter cache and optimistic locking.
 
-    *Dennis Taylor*
+    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.
 
-*   Fix eager loading/preloading association with scope including joins.
+    Fixes #16449.
 
-    Fixes #28324.
+    *Aaron Lipman*
 
-    *Ryuta Kamizono*
+*   Support merging option `:rewhere` to allow mergee side condition to be replaced exactly.
 
-*   Fix transactions to apply state to child transactions.
+    ```ruby
+    david_and_mary = Author.where(id: david.id..mary.id)
 
-    Previously, if you had a nested transaction and the outer transaction was rolledback, the record from the
-    inner transaction would still be marked as persisted.
+    # both conflict conditions exists
+    david_and_mary.merge(Author.where(id: bob)) # => []
 
-    This change fixes that by applying the state of the parent transaction to the child transaction when the
-    parent transaction is rolledback. This will correctly mark records from the inner transaction as not persisted.
+    # mergee side condition is replaced by rewhere
+    david_and_mary.merge(Author.rewhere(id: bob)) # => [bob]
 
-    *Eileen M. Uchitelle*, *Aaron Patterson*
+    # mergee side condition is replaced by rewhere option
+    david_and_mary.merge(Author.where(id: bob), rewhere: true) # => [bob]
+    ```
 
-*   Deprecate `set_state` method in `TransactionState`.
+    *Ryuta Kamizono*
 
-    Deprecated the `set_state` method in favor of setting the state via specific methods. If you need to mark the
-    state of the transaction you can now use `rollback!`, `commit!` or `nullify!` instead of
-    `set_state(:rolledback)`, `set_state(:committed)`, or `set_state(nil)`.
+*   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.
 
-    *Eileen M. Uchitelle*, *Aaron Patterson*
+    ```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.
 
-*   Deprecate delegating to `arel` in `Relation`.
+    *Ryuta Kamizono*
+
+*   Fix index creation to preserve index comment in bulk change table on MySQL.
 
     *Ryuta Kamizono*
 
-*   Query cache was unavailable when entering the `ActiveRecord::Base.cache` block
-    without being connected.
+*   Allow `unscope` to be aware of table name qualified values.
 
-    *Tsukasa Oishi*
+    It is possible to unscope only the column in the specified table.
 
-*   Previously, when building records using a `has_many :through` association,
-    if the child records were deleted before the parent was saved, they would
-    still be persisted. Now, if child records are deleted before the parent is saved
-    on a `has_many :through` association, the child records will not be persisted.
+    ```ruby
+    posts = Post.joins(:comments).group(:"posts.hidden")
+    posts = posts.where("posts.hidden": false, "comments.hidden": false)
 
-    *Tobias Kraze*
+    posts.count
+    # => { false => 10 }
 
-*   Merging two relations representing nested joins no longer transforms the joins of
-    the merged relation into LEFT OUTER JOIN.
+    # unscope both hidden columns
+    posts.unscope(where: :hidden).count
+    # => { false => 11, true => 1 }
 
-    Example:
+    # 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]
     ```
-    Author.joins(:posts).merge(Post.joins(:comments))
-    # Before the change:
-    #=> SELECT ... FROM authors INNER JOIN posts ON ... LEFT OUTER JOIN comments ON...
 
-    # After the change:
-    #=> SELECT ... FROM authors INNER JOIN posts ON ... INNER JOIN comments ON...
+    *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">
     ```
 
-    *Maxime Handfield Lapointe*
+    *akinomaeni*, *Jonathan Hefner*
 
-*   `ActiveRecord::Persistence#touch` does not work well when optimistic locking enabled and
-    `locking_column`, without default value, is null in the database.
+*   Deprecate passing a column to `type_cast`.
 
-    *bogdanvlviv*
+    *Ryuta Kamizono*
 
-*   Fix destroying existing object does not work well when optimistic locking enabled and
-    `locking_column` is null in the database.
+*   Deprecate `in_clause_length` and `allowed_index_name_length` in `DatabaseLimits`.
 
-    *bogdanvlviv*
+    *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*
 
-*   Use bulk INSERT to insert fixtures for better performance.
+*   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*
 
-*   Prevent creation of bind param if casted value is nil.
+*   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*
 
-*   Deprecate passing arguments and block at the same time to `count` and `sum` in `ActiveRecord::Calculations`.
+*   Preserve user supplied joins order as much as possible.
+
+    Fixes #36761, #34328, #24281, #12953.
 
     *Ryuta Kamizono*
 
-*   Loading model schema from database is now thread-safe.
+*   Allow `matches_regex` and `does_not_match_regexp` on the MySQL Arel visitor.
 
-    Fixes #28589.
+    *James Pearson*
 
-    *Vikrant Chaudhary*, *David Abdemoulaie*
+*   Allow specifying fixtures to be ignored by setting `ignore` in YAML file's '_fixture' section.
 
-*   Add `ActiveRecord::Base#cache_version` to support recyclable cache keys via the new versioned entries
-    in `ActiveSupport::Cache`. This also means that `ActiveRecord::Base#cache_key` will now return a stable key
-    that does not include a timestamp any more.
+    *Tongfei Gao*
 
-    NOTE: This feature is turned off by default, and `#cache_key` will still return cache keys with timestamps
-    until you set `ActiveRecord::Base.cache_versioning = true`. That's the setting for all new apps on Rails 5.2+
+*   Make the DATABASE_URL env variable only affect the primary connection. Add new env variables for multiple databases.
 
-    *DHH*
+    *John Crepezzi*, *Eileen Uchitelle*
 
-*   Respect `SchemaDumper.ignore_tables` in rake tasks for databases structure dump.
+*   Add a warning for enum elements with 'not_' prefix.
 
-    *Rusty Geldmacher*, *Guillermo Iguaran*
+        class Foo
+          enum status: [:sent, :not_sent]
+        end
 
-*   Add type caster to `RuntimeReflection#alias_name`.
+    *Edu Depetris*
 
-    Fixes #28959.
+*   Make currency symbols optional for money column type in PostgreSQL.
 
-    *Jon Moss*
+    *Joel Schneider*
 
-*   Deprecate `supports_statement_cache?`.
+*   Add support for beginless ranges, introduced in Ruby 2.7.
 
-    *Ryuta Kamizono*
+    *Josh Goodall*
 
-*   Raise error `UnknownMigrationVersionError` on the movement of migrations
-    when the current migration does not exist.
+*   Add `database_exists?` method to connection adapters to check if a database exists.
 
-    *bogdanvlviv*
+    *Guilherme Mansur*
 
-*   Fix `bin/rails db:forward` first migration.
+*   Loading the schema for a model that has no `table_name` raises a `TableNotSpecified` error.
 
-    *bogdanvlviv*
+    *Guilherme Mansur*, *Eugene Kenny*
 
-*   Support Descending Indexes for MySQL.
+*   PostgreSQL: Fix GROUP BY with ORDER BY virtual count attribute.
 
-    MySQL 8.0.1 and higher supports descending indexes: `DESC` in an index definition is no longer ignored.
-    See https://dev.mysql.com/doc/refman/8.0/en/descending-indexes.html.
+    Fixes #36022.
 
     *Ryuta Kamizono*
 
-*   Fix inconsistency with changed attributes when overriding Active Record attribute reader.
+*   Make ActiveRecord `ConnectionPool.connections` method thread-safe.
 
-    *bogdanvlviv*
+    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*
 
-*   When calling the dynamic fixture accessor method with no arguments, it now returns all fixtures of this type.
-    Previously this method always returned an empty array.
+*   Allow generated `create_table` migrations to include or skip timestamps.
 
-    *Kevin McPhillips*
+    *Michael Duchemin*
 
 
-Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-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.