activerecord 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed17e948626d108075b2951ac71abbac3075ef55b055abe64e2b352e91755fd9
-  data.tar.gz: 2c031642e021041f9fdf278888b580fd446879008a23f12d33c8b33aafbddc59
+  metadata.gz: 418812373f3ff5fd16133fe0928b94b80b78b8a366abfc23a205fcb2ccc5a3e3
+  data.tar.gz: 70db1902a8fc82b1c46f8a7731ffb358357bc8cac29564a57881a732dbd2a65a
 SHA512:
-  metadata.gz: 6b208a5cbee77c2a057649b762a92ec4ca5be3b8fbd1b2123caf485579abbc602bcb2aee455a503b74f33efa9ce364ab644dc8958b9e1edd94fee3397bf17cc8
-  data.tar.gz: 751ecf72279d478887665f6a3efc5ad366b70284fb3f4ef6d2f3b072faf7c325be660116a7d3ac9427ac44dcf6f8c345e145921692d0465e24a70f1c2ca3b1bd
+  metadata.gz: 31ae64f629cb62f63bc37c74a888d557f9f0b102d401f2f9cf62c7d31655d99e5161ae9bc7f8be874c7a9cf27ec879dde3c04075df5cb2b5868891c0db144a50
+  data.tar.gz: cfc9585f3a6f53187707a9d96503269e3d4b1c5f1fe8c5f4db3bdefe8ce636042b6cf1fe9fb233491d1e8197f52293a7018a2f9925f1e34644ad1e30b134d59f

data/CHANGELOG.md

@@ -1,1013 +1,1303 @@
-## Rails 6.0.0 (August 16, 2019) ##
+## Rails 6.1.0 (December 09, 2020) ##
 
-*   Preserve user supplied joins order as much as possible.
+*   Only warn about negative enums if a positive form that would cause conflicts exists.
 
-    Fixes #36761, #34328, #24281, #12953.
+    Fixes #39065.
 
-    *Ryuta Kamizono*
+    *Alex Ghiculescu*
 
-*   Make the DATABASE_URL env variable only affect the primary connection. Add new env variables for multiple databases.
+*   Change `attribute_for_inspect` to take `filter_attributes` in consideration.
 
-    *John Crepezzi*, *Eileen Uchitelle*
+    *Rafael Mendonça França*
 
-*   Add a warning for enum elements with 'not_' prefix.
+*   Fix odd behavior of inverse_of with multiple belongs_to to same class.
 
-        class Foo
-          enum status: [:sent, :not_sent]
-        end
+    Fixes #35204.
 
-    *Edu Depetris*
+    *Tomoyuki Kai*
 
-*   Make currency symbols optional for money column type in PostgreSQL
+*   Build predicate conditions with objects that delegate `#id` and primary key:
 
-    *Joel Schneider*
+    ```ruby
+    class AdminAuthor
+      delegate_missing_to :@author
 
+      def initialize(author)
+        @author = author
+      end
+    end
 
-## Rails 6.0.0.rc2 (July 22, 2019) ##
+    Post.where(author: AdminAuthor.new(author))
+    ```
 
-*   Add database_exists? method to connection adapters to check if a database exists.
+    *Sean Doyle*
 
-    *Guilherme Mansur*
+*   Add `connected_to_many` API.
 
-*   PostgreSQL: Fix GROUP BY with ORDER BY virtual count attribute.
+    This API allows applications to connect to multiple databases at once without switching all of them or implementing a deeply nested stack.
 
-    Fixes #36022.
+    Before:
 
-    *Ryuta Kamizono*
+      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
 
-*   Make ActiveRecord `ConnectionPool.connections` method thread-safe.
+    After:
 
-    Fixes #36465.
+      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
 
-    *Jeff Doering*
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-*   Fix sqlite3 collation parsing when using decimal columns.
+*   Add option to raise or log for `ActiveRecord::StrictLoadingViolationError`.
 
-    *Martin R. Schuster*
+    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.
 
-*   Fix invalid schema when primary key column has a comment.
+    Set `config.active_record.action_on_strict_loading_violation` to `:log` errors instead of raising.
 
-    Fixes #29966.
+    *Eileen M. Uchitelle*
 
-    *Guilherme Goettems Schneider*
+*   Allow the inverse of a `has_one` association that was previously autosaved to be loaded.
 
-*   Fix table comment also being applied to the primary key column.
+    Fixes #34255.
 
-    *Guilherme Goettems Schneider*
+    *Steven Weber*
+
+*   Optimise the length of index names for polymorphic references by using the reference name rather than the type and id column names.
+
+    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.
+
+    This change reduces the chance of that happening by using the reference name, e.g. `index_my_table_on_my_reference`.
 
-*   Fix merging left_joins to maintain its own `join_type` context.
+    Fixes #38655.
 
-    Fixes #36103.
+    *Luke Redpath*
+
+*   MySQL: Uniqueness validator now respects default database collation,
+    no longer enforce case sensitive comparison by default.
 
     *Ryuta Kamizono*
 
+*   Remove deprecated methods from `ActiveRecord::ConnectionAdapters::DatabaseLimits`.
+
+    `column_name_length`
+    `table_name_length`
+    `columns_per_table`
+    `indexes_per_table`
+    `columns_per_multicolumn_index`
+    `sql_query_length`
+    `joins_per_query`
 
-## Rails 6.0.0.rc1 (April 24, 2019) ##
+    *Rafael Mendonça França*
 
-*   Add `touch` option to `has_one` association.
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::AbstractAdapter#supports_multi_insert?`.
 
-    *Abhay Nikam*
+    *Rafael Mendonça França*
 
-*   Deprecate `where.not` working as NOR and will be changed to NAND in Rails 6.1.
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::AbstractAdapter#supports_foreign_keys_in_create?`.
 
-    ```ruby
-    all = [treasures(:diamond), treasures(:sapphire), cars(:honda), treasures(:sapphire)]
-    assert_equal all, PriceEstimate.all.map(&:estimate_of)
-    ```
+    *Rafael Mendonça França*
 
-    In Rails 6.0:
+*   Remove deprecated `ActiveRecord::ConnectionAdapters::PostgreSQLAdapter#supports_ranges?`.
 
-    ```ruby
-    sapphire = treasures(:sapphire)
+    *Rafael Mendonça França*
 
-    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
+*   Remove deprecated `ActiveRecord::Base#update_attributes` and `ActiveRecord::Base#update_attributes!`.
 
-    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)
-    ```
+    *Rafael Mendonça França*
 
-    In Rails 6.1:
+*   Remove deprecated `migrations_path` argument in `ActiveRecord::ConnectionAdapter::SchemaStatements#assume_migrated_upto_version`.
 
-    ```ruby
-    sapphire = treasures(:sapphire)
+    *Rafael Mendonça França*
 
-    nand = all - [sapphire]
-    assert_equal [treasures(:diamond), cars(:honda)], nand
+*   Remove deprecated `config.active_record.sqlite3.represent_boolean_as_integer`.
 
-    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)
-    ```
+    *Rafael Mendonça França*
+
+*   `relation.create` does no longer leak scope to class level querying methods
+    in initialization block and callbacks.
+
+    Before:
+
+        User.where(name: "John").create do |john|
+          User.find_by(name: "David") # => nil
+        end
+
+    After:
+
+        User.where(name: "John").create do |john|
+          User.find_by(name: "David") # => #<User name: "David", ...>
+        end
 
     *Ryuta Kamizono*
 
-*   Fix dirty tracking after rollback.
+*   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:
 
-    Fixes #15018, #30167, #33868.
+        User.where(name: "John").david
+        # SELECT * FROM users WHERE name = 'John' AND name = 'David'
+
+    After:
+
+        User.where(name: "John").david
+        # SELECT * FROM users WHERE name = 'David'
 
     *Ryuta Kamizono*
 
-*   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.
+*   Remove deprecated methods from `ActiveRecord::DatabaseConfigurations`.
 
-    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+
+    `fetch`
+    `each`
+    `first`
+    `values`
+    `[]=`
 
-    *Lachlan Sylvester*
+    *Rafael Mendonça França*
 
-*   Fix dirty tracking for `touch` to track saved changes.
+*   `where.not` now generates NAND predicates instead of NOR.
 
-    Fixes #33429.
+     Before:
 
-    *Ryuta Kamzono*
+         User.where.not(name: "Jon", role: "admin")
+         # SELECT * FROM users WHERE name != 'Jon' AND role != 'admin'
 
-*   `change_column_comment` and `change_table_comment` are invertible only if
-    `to` and `from` options are specified.
+     After:
 
-    *Yoshiyuki Kinjo*
+         User.where.not(name: "Jon", role: "admin")
+         # SELECT * FROM users WHERE NOT (name == 'Jon' AND role == 'admin')
 
-*   Don't call commit/rollback callbacks when a record isn't saved.
+    *Rafael Mendonça França*
 
-    Fixes #29747.
+*   Remove deprecated `ActiveRecord::Result#to_hash` method.
 
-    *Ryuta Kamizono*
+    *Rafael Mendonça França*
 
-*   Fix circular `autosave: true` causes invalid records to be saved.
+*   Deprecate `ActiveRecord::Base.allow_unsafe_raw_sql`.
 
-    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`.
+    *Rafael Mendonça França*
 
-    Fixes #28080.
+*   Remove deprecated support for using unsafe raw SQL in `ActiveRecord::Relation` methods.
 
-    *Larry Reid*
+    *Rafael Mendonça França*
 
-*   Raise `ArgumentError` for invalid `:limit` and `:precision` like as other options.
+*   Allow users to silence the "Rails couldn't infer whether you are using multiple databases..."
+    message using `config.active_record.suppress_multiple_database_warning`.
 
-    Before:
+    *Omri Gabay*
+
+*   Connections can be granularly switched for abstract classes when `connected_to` is called.
+
+    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.
+
+    Example usage:
+
+    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`.
 
     ```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
+    ActiveRecord::Base.connected_to(role: :reading) do
+      User.first # reads from default replica
+      Dog.first # reads from default replica
+
+      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
     ```
 
-    After:
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   Allow double-dash comment syntax when querying read-only databases
+
+    *James Adam*
+
+*   Add `values_at` method.
+
+    Returns an array containing the values associated with the given methods.
 
     ```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
+    topic = Topic.first
+    topic.values_at(:title, :author_name)
+    # => ["Budget", "Jason"]
     ```
 
-    *Ryuta Kamizono*
+    Similar to `Hash#values_at` but on an Active Record instance.
 
-*   Association loading isn't to be affected by scoping consistently
-    whether preloaded / eager loaded or not, with the exception of `unscoped`.
+    *Guillaume Briday*
 
-    Before:
+*   Fix `read_attribute_before_type_cast` to consider attribute aliases.
+
+    *Marcelo Lauxen*
+
+*   Support passing record to uniqueness validator `:conditions` callable:
 
     ```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, ...>
+    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
     ```
 
-    After:
+    *Eliot Sykes*
+
+*   `BatchEnumerator#update_all` and `BatchEnumerator#delete_all` now return the
+    total number of rows affected, just like their non-batched counterparts.
+
+    ```ruby
+    Person.in_batches.update_all("first_name = 'Eugene'") # => 42
+    Person.in_batches.delete_all # => 42
+    ```
+
+    Fixes #40287.
+
+    *Eugene Kenny*
+
+*   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.
+
+    To use this in 6.1, you need to place the next string to your model file:
+
+        attribute :duration, :interval
+
+    To keep old behavior until 6.2 is released:
+
+        attribute :duration, :string
+
+    Example:
+
+        create_table :events do |t|
+          t.string   :name
+          t.interval :duration
+        end
+
+        class Event < ApplicationRecord
+          attribute :duration, :interval
+        end
+
+        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
+
+    *Andrey Novikov*
+
+*   Allow associations supporting the `dependent:` key to take `dependent: :destroy_async`.
 
     ```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, ...>
+    class Account < ActiveRecord::Base
+        belongs_to :supplier, dependent: :destroy_async
     end
     ```
 
-    Fixes #34638, #35398.
+    `:destroy_async` will enqueue a job to destroy associated records in the background.
 
-    *Ryuta Kamizono*
+    *DHH*, *George Claghorn*, *Cory Gwin*, *Rafael Mendonça França*, *Adrianna Chang*
 
-*   Add `rails db:prepare` to migrate or setup a database.
+*   Add `SKIP_TEST_DATABASE` environment variable to disable modifying the test database when `rails db:create` and `rails db:drop` are called.
 
-    Runs `db:migrate` if the database exists or `db:setup` if it doesn't.
+    *Jason Schweier*
 
-    *Roberto Miranda*
+*   `connects_to` can only be called on `ActiveRecord::Base` or abstract classes.
 
-*   Add `after_save_commit` callback as shortcut for `after_commit :hook, on: [ :create, :update ]`.
+    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.
 
-    *DHH*
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   All connection adapters `execute` now raises `ActiveRecord::ConnectionNotEstablished` rather than
+    `ActiveRecord::StatementInvalid` when they encounter a connection error.
 
-*   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.
+    *Jean Boussier*
 
-    Fixes #33249.
+*   `Mysql2Adapter#quote_string` now raises `ActiveRecord::ConnectionNotEstablished` rather than
+    `ActiveRecord::StatementInvalid` when it can't connect to the MySQL server.
 
-    *Ryan H. Kerr*
+    *Jean Boussier*
+
+*   Add support for check constraints that are `NOT VALID` via `validate: false` (PostgreSQL-only).
+
+    *Alex Robbin*
+
+*   Ensure the default configuration is considered primary or first for an environment
+
+    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.
+
+    *Eileen M. Uchitelle*
 
-*   Add `ActiveRecord::Relation#extract_associated` for extracting associated records from a relation.
+*   Allow `where` references association names as joined table name aliases.
 
+    ```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")
     ```
-    account.memberships.extract_associated(:user)
-    # => Returns collection of User records
+
+    *Ryuta Kamizono*
+
+*   Support storing demodulized class name for polymorphic type.
+
+    Before Rails 6.1, storing demodulized class name is supported only for STI type
+    by `store_full_sti_class` class attribute.
+
+    Now `store_full_class_name` class attribute can handle both STI and polymorphic types.
+
+    *Ryuta Kamizono*
+
+*   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.
+
+    *fatkodima*
+
+*   Respect the `select` values for eager loading.
+
+    ```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
     ```
 
-    *DHH*
+    *Ryuta Kamizono*
 
-*   Add `ActiveRecord::Relation#annotate` for adding SQL comments to its queries.
+*   Allow attribute's default to be configured but keeping its own type.
 
-    For example:
+    ```ruby
+    class Post < ActiveRecord::Base
+      attribute :written_at, default: -> { Time.now.utc }
+    end
+
+    # Rails 6.0
+    Post.type_for_attribute(:written_at) # => #<Type::Value ... precision: nil, ...>
 
+    # Rails 6.1
+    Post.type_for_attribute(:written_at) # => #<Type::DateTime ... precision: 6, ...>
     ```
-    Post.where(id: 123).annotate("this is a comment").to_sql
-    # SELECT "posts".* FROM "posts" WHERE "posts"."id" = 123 /* this is a comment */
+
+    *Ryuta Kamizono*
+
+*   Allow default to be configured for Enum.
+
+    ```ruby
+    class Book < ActiveRecord::Base
+      enum status: [:proposed, :written, :published], _default: :published
+    end
+
+    Book.new.status # => "published"
     ```
 
-    This can be useful in instrumentation or other analysis of issued queries.
+    *Ryuta Kamizono*
 
-    *Matt Yoho*
+*   Deprecate YAML loading from legacy format older than Rails 5.0.
 
-*   Support Optimizer Hints.
+    *Ryuta Kamizono*
 
-    In most databases, a way to control the optimizer is by using optimizer hints,
-    which can be specified within individual statements.
+*   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.
 
-    Example (for MySQL):
+    *Sean Griffin*, *Ryuta Kamizono*
 
-        Topic.optimizer_hints("MAX_EXECUTION_TIME(50000)", "NO_INDEX_MERGE(topics)")
-        # SELECT /*+ MAX_EXECUTION_TIME(50000) NO_INDEX_MERGE(topics) */ `topics`.* FROM `topics`
+*   Deprecate `map!` and `collect!` on `ActiveRecord::Result`.
 
-    Example (for PostgreSQL with pg_hint_plan):
+    *Ryuta Kamizono*
 
-        Topic.optimizer_hints("SeqScan(topics)", "Parallel(topics 8)")
-        # SELECT /*+ SeqScan(topics) Parallel(topics 8) */ "topics".* FROM "topics"
+*   Support `relation.and` for intersection as Set theory.
 
-    See also:
+    ```ruby
+    david_and_mary = Author.where(id: [david, mary])
+    mary_and_bob   = Author.where(id: [mary, bob])
+
+    david_and_mary.merge(mary_and_bob) # => [mary, bob]
 
-    * 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
+    david_and_mary.and(mary_and_bob) # => [mary]
+    david_and_mary.or(mary_and_bob)  # => [david, mary, bob]
+    ```
 
     *Ryuta Kamizono*
 
-*   Fix query attribute method on user-defined attribute to be aware of typecasted value.
+*   Merging conditions on the same column no longer maintain both conditions,
+    and will be consistently replaced by the latter condition in Rails 6.2.
+    To migrate to Rails 6.2'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)) # => []
 
-    For example, the following code no longer return false as casted non-empty string:
+    # Rails 6.1 with rewhere to migrate to Rails 6.2's behavior
+    Author.where(id: david.id..mary.id).merge(Author.where(id: bob), rewhere: true) # => [bob]
 
+    # Rails 6.2 (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]
     ```
-    class Post < ActiveRecord::Base
-      attribute :user_defined_text, :text
+
+    *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
 
-    Post.new(user_defined_text: "false").user_defined_text? # => true
+    Book.insert_all [{ name: "MyTest" }], unique_by: :index_books_on_lower_name
     ```
 
-    *Yuji Kamijima*
+    Fixes #39516.
 
-*   Quote empty ranges like other empty enumerables.
+    *Austen Madden*
 
-    *Patrick Rebsch*
+*   Add basic support for CHECK constraints to database migrations.
 
-*   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`.
+    Usage:
 
-    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.
+    ```ruby
+    add_check_constraint :products, "price > 0", name: "price_check"
+    remove_check_constraint :products, name: "price_check"
+    ```
 
-    *Bob Lail*
+    *fatkodima*
 
-*   Add `rails db:seed:replant` that truncates tables of each database
-    for current environment and loads the seeds.
+*   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.
 
-    *bogdanvlviv*, *DHH*
+    Usage:
 
-*   Add `ActiveRecord::Base.connection.truncate` for SQLite3 adapter.
+    ```ruby
+    class Developer < ApplicationRecord
+      self.strict_loading_by_default = true
 
-    *bogdanvlviv*
+      has_many :projects
+    end
 
-*   Deprecate mismatched collation comparison for uniqueness validator.
+    dev = Developer.first
+    dev.projects.first
+    # => ActiveRecord::StrictLoadingViolationError Exception: Developer is marked as strict_loading and Project cannot be lazily loaded.
+    ```
 
-    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.
+    *bogdanvlviv*
+
+*   Deprecate passing an Active Record object to `quote`/`type_cast` directly.
 
     *Ryuta Kamizono*
 
-*   Add `reselect` method. This is a short-hand for `unscope(:select).select(fields)`.
+*   Default engine `ENGINE=InnoDB` is no longer dumped to make schema more agnostic.
 
-    Fixes #27340.
+    Before:
 
-    *Willian Gustavo Veiga*
+    ```ruby
+    create_table "accounts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci", force: :cascade do |t|
+    end
+    ```
 
-*   Add negative scopes for all enum values.
+    After:
 
-    Example:
+    ```ruby
+    create_table "accounts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    end
+    ```
 
-        class Post < ActiveRecord::Base
-          enum status: %i[ drafted active trashed ]
-        end
+    *Ryuta Kamizono*
 
-        Post.not_drafted # => where.not(status: :drafted)
-        Post.not_active  # => where.not(status: :active)
-        Post.not_trashed # => where.not(status: :trashed)
+*   Added delegated type as an alternative to single-table inheritance for representing class hierarchies.
+    See ActiveRecord::DelegatedType for the full description.
 
     *DHH*
 
-*   Fix different `count` calculation when using `size` with manual `select` with DISTINCT.
+*   Deprecate aggregations with group by duplicated fields.
 
-    Fixes #35214.
+    To migrate to Rails 6.2's behavior, use `uniq!(:group)` to deduplicate group fields.
 
-    *Juani Villarejo*
+    ```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*
 
-## Rails 6.0.0.beta3 (March 11, 2019) ##
+*   Deprecate duplicated query annotations.
 
-*   No changes.
+    To migrate to Rails 6.2's behavior, use `uniq!(:annotate)` to deduplicate query annotations.
 
+    ```ruby
+    accounts = Account.where(id: [1, 2]).annotate("david and mary")
 
-## Rails 6.0.0.beta2 (February 25, 2019) ##
+    # duplicated annotations, deprecated.
+    accounts.merge(accounts.rewhere(id: 3))
+    # SELECT accounts.* FROM accounts WHERE accounts.id = 3 /* david and mary */ /* david and mary */
 
-*   Fix prepared statements caching to be enabled even when query caching is enabled.
+    # 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*
 
-*   Ensure `update_all` series cares about optimistic locking.
+*   Resolve conflict between counter cache and optimistic locking.
 
-    *Ryuta Kamizono*
+    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.
 
-*   Don't allow `where` with non numeric string matches to 0 values.
+    Fixes #16449.
 
-    *Ryuta Kamizono*
+    *Aaron Lipman*
 
-*   Introduce `ActiveRecord::Relation#destroy_by` and `ActiveRecord::Relation#delete_by`.
+*   Support merging option `:rewhere` to allow mergee side condition to be replaced exactly.
 
-    `destroy_by` allows relation to find all the records matching the condition and perform
-    `destroy_all` on the matched records.
+    ```ruby
+    david_and_mary = Author.where(id: david.id..mary.id)
 
-    Example:
+    # both conflict conditions exists
+    david_and_mary.merge(Author.where(id: bob)) # => []
 
-        Person.destroy_by(name: 'David')
-        Person.destroy_by(name: 'David', rating: 4)
+    # mergee side condition is replaced by rewhere
+    david_and_mary.merge(Author.rewhere(id: bob)) # => [bob]
 
-        david = Person.find_by(name: 'David')
-        david.posts.destroy_by(id: [1, 2, 3])
+    # mergee side condition is replaced by rewhere option
+    david_and_mary.merge(Author.where(id: bob), rewhere: true) # => [bob]
+    ```
 
-    `delete_by` allows relation to find all the records matching the condition and perform
-    `delete_all` on the matched records.
+    *Ryuta Kamizono*
 
-    Example:
+*   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.
 
-        Person.delete_by(name: 'David')
-        Person.delete_by(name: 'David', rating: 4)
+    ```ruby
+    signed_id = User.first.signed_id expires_in: 15.minutes, purpose: :password_reset
 
-        david = Person.find_by(name: 'David')
-        david.posts.delete_by(id: [1, 2, 3])
+    User.find_signed signed_id # => nil, since the purpose does not match
 
-    *Abhay Nikam*
+    travel 16.minutes
+    User.find_signed signed_id, purpose: :password_reset # => nil, since the signed id has expired
 
-*   Don't allow `where` with invalid value matches to nil values.
+    travel_back
+    User.find_signed signed_id, purpose: :password_reset # => User.first
 
-    Fixes #33624.
+    User.find_signed! "bad data" # => ActiveSupport::MessageVerifier::InvalidSignature
+    ```
 
-    *Ryuta Kamizono*
+    *DHH*
 
-*   SQLite3: Implement `add_foreign_key` and `remove_foreign_key`.
+*   Support `ALGORITHM = INSTANT` DDL option for index operations on MySQL.
 
     *Ryuta Kamizono*
 
-*   Deprecate using class level querying methods if the receiver scope
-    regarded as leaked. Use `klass.unscoped` to avoid the leaking scope.
+*   Fix index creation to preserve index comment in bulk change table on MySQL.
 
     *Ryuta Kamizono*
 
-*   Allow applications to automatically switch connections.
+*   Allow `unscope` to be aware of table name qualified values.
 
-    Adds a middleware and configuration options that can be used in your
-    application to automatically switch between the writing and reading
-    database connections.
+    It is possible to unscope only the column in the specified table.
 
-    `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.
+    ```ruby
+    posts = Post.joins(:comments).group(:"posts.hidden")
+    posts = posts.where("posts.hidden": false, "comments.hidden": false)
 
-    To use the middleware in your application you can use the following
-    configuration options:
+    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 }
     ```
-    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
-    ```
 
-    To change the database selection strategy, pass a custom class to the
-    configuration options:
+    *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]
     ```
-    config.active_record.database_selector = { delay: 10.seconds }
-    config.active_record.database_resolver = MyResolver
-    config.active_record.database_resolver_context = MyResolver::MyCookies
+
+    *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">
     ```
 
-    *Eileen M. Uchitelle*
+    *akinomaeni*, *Jonathan Hefner*
 
-*   MySQL: Support `:size` option to change text and blob size.
+*   Deprecate passing a column to `type_cast`.
 
     *Ryuta Kamizono*
 
-*   Make `t.timestamps` with precision by default.
+*   Deprecate `in_clause_length` and `allowed_index_name_length` in `DatabaseLimits`.
 
     *Ryuta Kamizono*
 
+*   Support bulk insert/upsert on relation to preserve scope values.
 
-## Rails 6.0.0.beta1 (January 18, 2019) ##
+    *Josef Šimánek*, *Ryuta Kamizono*
 
-*   Remove deprecated `#set_state` from the transaction object.
+*   Preserve column comment value on changing column name on MySQL.
 
-    *Rafael Mendonça França*
+    *Islam Taha*
 
-*   Remove deprecated `#supports_statement_cache?` from the database adapters.
+*   Add support for `if_exists` option for removing an index.
 
-    *Rafael Mendonça França*
+    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.
 
-*   Remove deprecated `#insert_fixtures` from the database adapters.
+    *Eileen M. Uchitelle*
 
-    *Rafael Mendonça França*
+*   Remove ibm_db, informix, mssql, oracle, and oracle12 Arel visitors which are not used in the code base.
 
-*   Remove deprecated `ActiveRecord::ConnectionAdapters::SQLite3Adapter#valid_alter_table_type?`.
+    *Ryuta Kamizono*
 
-    *Rafael Mendonça França*
+*   Prevent `build_association` from `touching` a parent record if the record isn't persisted for `has_one` associations.
 
-*   Do not allow passing the column name to `sum` when a block is passed.
+    Fixes #38219.
 
-    *Rafael Mendonça França*
+    *Josh Brody*
 
-*   Do not allow passing the column name to `count` when a block is passed.
+*   Add support for `if_not_exists` option for adding index.
 
-    *Rafael Mendonça França*
+    The `add_index` method respects `if_not_exists` option. If it is set to true
+    index won't be added.
 
-*   Remove delegation of missing methods in a relation to arel.
+    Usage:
 
-    *Rafael Mendonça França*
+    ```ruby
+      add_index :users, :account_id, if_not_exists: true
+    ```
 
-*   Remove delegation of missing methods in a relation to private methods of the class.
+    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.
 
-    *Rafael Mendonça França*
+    *Prathamesh Sonpatki*
 
-*   Deprecate `config.activerecord.sqlite3.represent_boolean_as_integer`.
+*   Add `ActiveRecord::Base#previously_new_record?` to show if a record was new before the last save.
 
-    *Rafael Mendonça França*
+    *Tom Ward*
 
-*   Change `SQLite3Adapter` to always represent boolean values as integers.
+*   Support descending order for `find_each`, `find_in_batches`, and `in_batches`.
 
-    *Rafael Mendonça França*
+    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.
 
-*   Remove ability to specify a timestamp name for `#cache_key`.
+    This change allows reversing the order, batching from newest to oldest. This is useful when you need to process newer batches of records first.
 
-    *Rafael Mendonça França*
+    Pass `order: :desc` to yield batches in descending order. The default remains `order: :asc`.
 
-*   Remove deprecated `ActiveRecord::Migrator.migrations_path=`.
+    ```ruby
+    Person.find_each(order: :desc) do |person|
+      person.party_all_night!
+    end
+    ```
 
-    *Rafael Mendonça França*
+    *Alexey Vasiliev*
 
-*   Remove deprecated `expand_hash_conditions_for_aggregates`.
+*   Fix `insert_all` with enum values.
 
-    *Rafael Mendonça França*
+    Fixes #38716.
 
-*   Set polymorphic type column to NULL on `dependent: :nullify` strategy.
+    *Joel Blum*
 
-    On polymorphic associations both the foreign key and the foreign type columns will be set to NULL.
+*   Add support for `db:rollback:name` for multiple database applications.
 
-    *Laerti Papa*
+    Multiple database applications will now raise if `db:rollback` is call and recommend using the `db:rollback:[NAME]` to rollback migrations.
 
-*   Allow permitted instance of `ActionController::Parameters` as argument of `ActiveRecord::Relation#exists?`.
+    *Eileen M. Uchitelle*
 
-    *Gannon McGibbon*
+*   `Relation#pick` now uses already loaded results instead of making another query.
 
-*   Add support for endless ranges introduces in Ruby 2.6.
+    *Eugene Kenny*
 
-    *Greg Navis*
+*   Deprecate using `return`, `break` or `throw` to exit a transaction block after writes.
 
-*   Deprecate passing `migrations_paths` to `connection.assume_migrated_upto_version`.
+    *Dylan Thacker-Smith*
 
-    *Ryuta Kamizono*
+*   Dump the schema or structure of a database when calling `db:migrate:name`.
 
-*   MySQL: `ROW_FORMAT=DYNAMIC` create table option by default.
+    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.
 
-    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.
+    Going forward, calls to `rails db:migrate:name` will dump the schema (or structure) of the database being migrated.
 
-    *Ryuta Kamizono*
+    *Kyle Thompson*
 
-*   Fix join table column quoting with SQLite.
+*   Reset the `ActiveRecord::Base` connection after `rails db:migrate:name`.
 
-    *Gannon McGibbon*
+    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.
 
-*   Allow disabling scopes generated by `ActiveRecord.enum`.
+    *Kyle Thompson*
 
-    *Alfred Dominic*
+*   Disallow calling `connected_to` on subclasses of `ActiveRecord::Base`.
 
-*   Ensure that `delete_all` on collection proxy returns affected count.
+    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.
 
-    *Ryuta Kamizono*
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-*   Reset scope after delete on collection association to clear stale offsets of removed records.
+*   Add support for horizontal sharding to `connects_to` and `connected_to`.
 
-    *Gannon McGibbon*
+    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:
 
-*   Add the ability to prevent writes to a database for the duration of a block.
+    ```yaml
+    # config/database.yml
+    production:
+      primary:
+        database: my_database
+      primary_shard_one:
+        database: my_database_shard_one
+    ```
 
-    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.
+    Connect to multiple shards:
 
-    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.
+    ```ruby
+    class ApplicationRecord < ActiveRecord::Base
+      self.abstract_class = true
 
-    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.
+      connects_to shards: {
+        default: { writing: :primary },
+        shard_one: { writing: :primary_shard_one }
+      }
+    ```
 
-    *Eileen M. Uchitelle*
+    Swap between shards in your controller / model code:
 
-*   Allow aliased attributes to be used in `#update_columns` and `#update`.
+    ```ruby
+    ActiveRecord::Base.connected_to(shard: :shard_one) do
+      # Read from shard one
+    end
+    ```
 
-    *Gannon McGibbon*
+    The horizontal sharding API also supports read replicas. See guides for more details.
 
-*   Allow spaces in postgres table names.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    Fixes issue where "user post" is misinterpreted as "\"user\".\"post\"" when quoting table names with the postgres adapter.
+*   Deprecate `spec_name` in favor of `name` on database configurations.
 
-    *Gannon McGibbon*
+    The accessors for `spec_name` on `configs_for` and `DatabaseConfig` are deprecated. Please use `name` instead.
+
+    Deprecated behavior:
 
-*   Cached `columns_hash` fields should be excluded from `ResultSet#column_types`.
+    ```ruby
+    db_config = ActiveRecord::Base.configs_for(env_name: "development", spec_name: "primary")
+    db_config.spec_name
+    ```
 
-    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:
+    New behavior:
 
     ```ruby
-    class DeveloperName < ActiveRecord::Type::String
-      def deserialize(value)
-        "Developer: #{value}"
-      end
-    end
+    db_config = ActiveRecord::Base.configs_for(env_name: "development", name: "primary")
+    db_config.name
+    ```
 
-    class AttributedDeveloper < ActiveRecord::Base
-      self.table_name = "developers"
+    *Eileen M. Uchitelle*
 
-      attribute :name, DeveloperName.new
+*   Add additional database-specific rake tasks for multi-database users.
 
-      self.ignored_columns += ["name"]
-    end
+    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:
 
-    developer = AttributedDeveloper.create
-    developer.update_column :name, "name"
+    ```
+    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:
 
-    loaded_developer = AttributedDeveloper.where(id: developer.id).select("*").first
-    puts loaded_developer.name # should be "Developer: name" but it's just "name"
+    ```
+    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
     ```
 
-    *Dmitry Tsepelev*
+    *Kyle Thompson*
 
-*   Make the implicit order column configurable.
+*   Add support for `strict_loading` mode on association declarations.
 
-    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.
+    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.
 
-    Example:
+    Usage:
 
-        class Project < ActiveRecord::Base
-          self.implicit_order_column = "created_at"
-        end
+    ```ruby
+    class Developer < ApplicationRecord
+      has_many :projects, strict_loading: true
+    end
 
-    *Tekin Suleyman*
+    dev = Developer.first
+    dev.projects.first
+    # => ActiveRecord::StrictLoadingViolationError: The projects association is marked as strict_loading and cannot be lazily loaded.
+    ```
 
-*   Bump minimum PostgreSQL version to 9.3.
+    *Kevin Deisz*
 
-    *Yasuo Honda*
+*   Add support for `strict_loading` mode to prevent lazy loading of records.
 
-*   Values of enum are frozen, raising an error when attempting to modify them.
+    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.
 
-    *Emmanuel Byrd*
+    Usage:
 
-*   Move `ActiveRecord::StatementInvalid` SQL to error property and include binds as separate error property.
+    ```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.
+    ```
 
-    `ActiveRecord::ConnectionAdapters::AbstractAdapter#translate_exception_class` now requires `binds` to be passed as the last argument.
+    *Eileen M. Uchitelle*, *Aaron Patterson*
 
-    `ActiveRecord::ConnectionAdapters::AbstractAdapter#translate_exception` now requires `message`, `sql`, and `binds` to be passed as keyword arguments.
+*   Add support for PostgreSQL 11+ partitioned indexes when using `upsert_all`.
 
-    Subclasses of `ActiveRecord::StatementInvalid` must now provide `sql:` and `binds:` arguments to `super`.
+    *Sebastián Palma*
 
-    Example:
+*   Adds support for `if_not_exists` to `add_column` and `if_exists` to `remove_column`.
 
-    ```
-    class MySubclassedError < ActiveRecord::StatementInvalid
-      def initialize(message, sql:, binds:)
-        super(message, sql: sql, binds: binds)
+    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
     ```
 
-    *Gannon McGibbon*
+    ```ruby
+    class RemoveColumnTitle < ActiveRecord::Migration[6.1]
+      def change
+        remove_column :posts, :title, if_exists: true
+      end
+    end
+    ```
 
-*   Add an `:if_not_exists` option to `create_table`.
+    *Eileen M. Uchitelle*
 
-    Example:
+*   Regexp-escape table name for MS SQL Server.
 
-        create_table :posts, if_not_exists: true do |t|
-          t.string :title
-        end
+    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.
 
-    That would execute:
+    *Larry Reid*
 
-        CREATE TABLE IF NOT EXISTS posts (
-          ...
-        )
+*   Store advisory locks on their own named connection.
 
-    If the table already exists, `if_not_exists: false` (the default) raises an
-    exception whereas `if_not_exists: true` does nothing.
+    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.
 
-    *fatkodima*, *Stefan Kanev*
+    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.
 
-*   Defining an Enum as a Hash with blank key, or as an Array with a blank value, now raises an `ArgumentError`.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    *Christophe Maximin*
+*   Allow schema cache path to be defined in the database configuration file.
 
-*   Adds support for multiple databases to `rails db:schema:cache:dump` and `rails db:schema:cache:clear`.
+    For example:
 
-    *Gannon McGibbon*
+    ```yaml
+    development:
+      adapter: postgresql
+      database: blog_development
+      pool: 5
+      schema_cache_path: tmp/schema/main.yml
+    ```
 
-*   `update_columns` now correctly raises `ActiveModel::MissingAttributeError`
-    if the attribute does not exist.
+    *Katrina Owen*
 
-    *Sean Griffin*
+*   Deprecate `#remove_connection` in favor of `#remove_connection_pool` when called on the handler.
 
-*   Add support for hash and URL configs in database hash of `ActiveRecord::Base.connected_to`.
+    `#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 6.2.
 
-    ````
-    User.connected_to(database: { writing: "postgres://foo" }) do
-      User.create!(name: "Gannon")
-    end
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    config = { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" }
-    User.connected_to(database: { reading: config }) do
-      User.count
-    end
-    ````
+*   Deprecate `#default_hash` and it's alias `#[]` on database configurations.
 
-    *Gannon McGibbon*
+    Applications should use `configs_for`. `#default_hash` and `#[]` will be removed in 6.2.
 
-*   Support default expression for MySQL.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    MySQL 8.0.13 and higher supports default value to be a function or expression.
+*   Add scale support to `ActiveRecord::Validations::NumericalityValidator`.
 
-    https://dev.mysql.com/doc/refman/8.0/en/create-table.html
+    *Gannon McGibbon*
 
-    *Ryuta Kamizono*
+*   Find orphans by looking for missing relations through chaining `where.missing`:
 
-*   Support expression indexes for MySQL.
+    Before:
 
-    MySQL 8.0.13 and higher supports functional key parts that index
-    expression values rather than column or column prefix values.
+    ```ruby
+    Post.left_joins(:author).where(authors: { id: nil })
+    ```
 
-    https://dev.mysql.com/doc/refman/8.0/en/create-index.html
+    After:
 
-    *Ryuta Kamizono*
+    ```ruby
+    Post.where.missing(:author)
+    ```
 
-*   Fix collection cache key with limit and custom select to avoid ambiguous timestamp column error.
+    *Tom Rossi*
 
-    Fixes #33056.
+*   Ensure `:reading` connections always raise if a write is attempted.
 
-    *Federico Martinez*
+    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`.
 
-*   Add basic API for connection switching to support multiple databases.
+    *Eileen M. Uchitelle*
 
-    1) Adds a `connects_to` method for models to connect to multiple databases. Example:
+*   Deprecate `"primary"` as the `connection_specification_name` for `ActiveRecord::Base`.
 
-    ```
-    class AnimalsModel < ApplicationRecord
-      self.abstract_class = true
+    `"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"`.
 
-      connects_to database: { writing: :animals_primary, reading: :animals_replica }
-    end
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    class Dog < AnimalsModel
-      # connected to both the animals_primary db for writing and the animals_replica for reading
-    end
-    ```
+*   Add `ActiveRecord::Validations::NumericalityValidator` with
+    support for casting floats using a database columns' precision value.
 
-    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.
+    *Gannon McGibbon*
 
-    ```
-    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
-    ```
+*   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.
 
-    ```
-    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
-    ```
+    Fixes #38078.
 
-    *Eileen M. Uchitelle*
+    *Aaron Lipman*
 
-*   Enum raises on invalid definition values
+*   Skip test database when running `db:create` or `db:drop` in development
+    with `DATABASE_URL` set.
 
-    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`.
+    *Brian Buchalter*
 
-    Fixes #33961
+*   Don't allow mutations on the database configurations hash.
 
-    *Alberto Almagro*
+    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.
 
-*   Reloading associations now clears the Query Cache like `Persistence#reload` does.
+    Before:
 
+    ```ruby
+    @db_config = ActiveRecord::Base.configurations.configs_for(env_name: "test", spec_name: "primary")
+    @db_config.configuration_hash.merge!(idle_timeout: "0.02")
     ```
-    class Post < ActiveRecord::Base
-      has_one :category
-      belongs_to :author
-      has_many :comments
-    end
 
-    # Each of the following will now clear the query cache.
-    post.reload_category
-    post.reload_author
-    post.comments.reload
+    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)
     ```
 
-    *Christophe Maximin*
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-*   Added `index` option for `change_table` migration helpers.
-    With this change you can create indexes while adding new
-    columns into the existing tables.
+*   Remove `:connection_id` from the `sql.active_record` notification.
 
-    Example:
+    *Aaron Patterson*, *Rafael Mendonça França*
 
-        change_table(:languages) do |t|
-          t.string :country_code, index: true
-        end
+*   The `:name` key will no longer be returned as part of `DatabaseConfig#configuration_hash`. Please use `DatabaseConfig#owner_name` instead.
 
-    *Mehmet Emin İNAÇ*
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-*   Fix `transaction` reverting for migrations.
+*   ActiveRecord's `belongs_to_required_by_default` flag can now be set per model.
 
-    Before: Commands inside a `transaction` in a reverted migration ran uninverted.
-    Now: This change fixes that by reverting commands inside `transaction` block.
+    You can now opt-out/opt-in specific models from having their associations required
+    by default.
 
-    *fatkodima*, *David Verhasselt*
+    This change is meant to ease the process of migrating all your models to have
+    their association required.
 
-*   Raise an error instead of scanning the filesystem root when `fixture_path` is blank.
+    *Edouard Chin*
 
-    *Gannon McGibbon*, *Max Albrecht*
+*   The `connection_config` method has been deprecated, please use `connection_db_config` instead which will return a `DatabaseConfigurations::DatabaseConfig` instead of a `Hash`.
 
-*   Allow `ActiveRecord::Base.configurations=` to be set with a symbolized hash.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    *Gannon McGibbon*
+*   Retain explicit selections on the base model after applying `includes` and `joins`.
 
-*   Don't update counter cache unless the record is actually saved.
+    Resolves #34889.
 
-    Fixes #31493, #33113, #33117.
+    *Patrick Rebsch*
 
-    *Ryuta Kamizono*
+*   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.
 
-*   Deprecate `ActiveRecord::Result#to_hash` in favor of `ActiveRecord::Result#to_a`.
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-    *Gannon McGibbon*, *Kevin Cheng*
+*   Allow attributes to be fetched from Arel node groupings.
 
-*   SQLite3 adapter supports expression indexes.
+    *Jeff Emminger*, *Gannon McGibbon*
 
-    ```
-    create_table :users do |t|
-      t.string :email
-    end
+*   A database URL can now contain a querystring value that contains an equal sign. This is needed to support passing PostgreSQL `options`.
 
-    add_index :users, 'lower(email)', name: 'index_users_on_email', unique: true
-    ```
+    *Joshua Flanagan*
 
-    *Gray Kemmey*
+*   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`.
 
-*   Allow subclasses to redefine autosave callbacks for associated records.
+    *John Crepezzi*
 
-    Fixes #33305.
+*   Specifying `implicit_order_column` now subsorts the records by primary key if available to ensure deterministic results.
 
-    *Andrey Subbota*
+    *Paweł Urbanek*
 
-*   Bump minimum MySQL version to 5.5.8.
+*   `where(attr => [])` now loads an empty result without making a query.
 
-    *Yasuo Honda*
+    *John Hawthorn*
 
-*   Use MySQL utf8mb4 character set by default.
+*   Fixed the performance regression for `primary_keys` introduced MySQL 8.0.
 
-    `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.
+    *Hiroyuki Ishii*
 
-    *Yasuo Honda*
+*   Add support for `belongs_to` to `has_many` inversing.
 
-*   Fix duplicated record creation when using nested attributes with `create_with`.
+    *Gannon McGibbon*
 
-    *Darwin Wu*
+*   Allow length configuration for `has_secure_token` method. The minimum length
+    is set at 24 characters.
 
-*   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.
+    Before:
 
+    ```ruby
+    has_secure_token :auth_token
     ```
-    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] ...>
+
+    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
     ```
 
-    *Zhang Kang*, *Yoshiyuki Kinjo*
+    *Bernardo de Araujo*
 
-*   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`.
+*   Deprecate `DatabaseConfigurations#to_h`. These connection hashes are still available via `ActiveRecord::Base.configurations.configs_for`.
 
-    *Ryuta Kamizono*
+    *Eileen Uchitelle*, *John Crepezzi*
 
-*   `ActiveRecord::Base.configurations` now returns an object.
+*   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.
 
-    `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.
+    *John Crepezzi*, *Eileen Uchitelle*
 
-    For example, the following `database.yml`:
+*   Allow column names to be passed to `remove_index` positionally along with other options.
 
-    ```
-    development:
-      adapter: sqlite3
-      database: db/development.sqlite3
-    ```
+    Passing other options can be necessary to make `remove_index` correctly reversible.
 
-    Used to become a hash:
+    Before:
 
-    ```
-    { "development" => { "adapter" => "sqlite3", "database" => "db/development.sqlite3" } }
-    ```
+        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
 
-    Is now converted into the following object:
+    After:
 
-    ```
-    #<ActiveRecord::DatabaseConfigurations:0x00007fd1acbdf800 @configurations=[
-      #<ActiveRecord::DatabaseConfigurations::HashConfig:0x00007fd1acbded10 @env_name="development",
-        @spec_name="primary", @config={"adapter"=>"sqlite3", "database"=>"db/development.sqlite3"}>
-      ]
-    ```
+        remove_index :reports, :report_id, unique: true # => works
 
-    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.
+    *Eugene Kenny*
 
-    ```
-    ActiveRecord::Base.configurations.configs_for(env_name: "development")
-    ActiveRecord::Base.configurations.configs_for(env_name: "development", spec_name: "primary")
-    ```
+*   Allow bulk `ALTER` statements to drop and recreate indexes with the same name.
 
-    *Eileen M. Uchitelle*, *Aaron Patterson*
+    *Eugene Kenny*
 
-*   Add database configuration to disable advisory locks.
+*   `insert`, `insert_all`, `upsert`, and `upsert_all` now clear the query cache.
 
-    ```
-    production:
-      adapter: postgresql
-      advisory_locks: false
-    ```
+    *Eugene Kenny*
 
-    *Guo Xiang*
+*   Call `while_preventing_writes` directly from `connected_to`.
 
-*   SQLite3 adapter `alter_table` method restores foreign keys.
+    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)`.
 
-    *Yasuo Honda*
+    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.
 
-*   Allow `:to_table` option to `invert_remove_foreign_key`.
+    *Eileen M. Uchitelle*
 
-    Example:
+*   Improve detection of ActiveRecord::StatementTimeout with mysql2 adapter in the edge case when the query is terminated during filesort.
 
-       remove_foreign_key :accounts, to_table: :owners
+    *Kir Shatrov*
 
-    *Nikolay Epifanov*, *Rich Chen*
+*   Stop trying to read yaml file fixtures when loading Active Record fixtures.
 
-*   Add environment & load_config dependency to `bin/rake db:seed` to enable
-    seed load in environments without Rails and custom DB configuration
+    *Gannon McGibbon*
 
-    *Tobias Bielohlawek*
+*   Deprecate `.reorder(nil)` with `.first` / `.first!` taking non-deterministic result.
 
-*   Fix default value for mysql time types with specified precision.
+    To continue taking non-deterministic result, use `.take` / `.take!` instead.
 
-    *Nikolay Kondratyev*
+    *Ryuta Kamizono*
 
-*   Fix `touch` option to behave consistently with `Persistence#touch` method.
+*   Preserve user supplied joins order as much as possible.
+
+    Fixes #36761, #34328, #24281, #12953.
 
     *Ryuta Kamizono*
 
-*   Migrations raise when duplicate column definition.
+*   Allow `matches_regex` and `does_not_match_regexp` on the MySQL Arel visitor.
 
-    Fixes #33024.
+    *James Pearson*
 
-    *Federico Martinez*
+*   Allow specifying fixtures to be ignored by setting `ignore` in YAML file's '_fixture' section.
 
-*   Bump minimum SQLite version to 3.8
+    *Tongfei Gao*
 
-    *Yasuo Honda*
+*   Make the DATABASE_URL env variable only affect the primary connection. Add new env variables for multiple databases.
 
-*   Fix parent record should not get saved with duplicate children records.
+    *John Crepezzi*, *Eileen Uchitelle*
 
-    Fixes #32940.
+*   Add a warning for enum elements with 'not_' prefix.
 
-    *Santosh Wadghule*
+        class Foo
+          enum status: [:sent, :not_sent]
+        end
 
-*   Fix logic on disabling commit callbacks so they are not called unexpectedly when errors occur.
+    *Edu Depetris*
 
-    *Brian Durand*
+*   Make currency symbols optional for money column type in PostgreSQL.
 
-*   Ensure `Associations::CollectionAssociation#size` and `Associations::CollectionAssociation#empty?`
-    use loaded association ids if present.
+    *Joel Schneider*
 
-    *Graham Turner*
+*   Add support for beginless ranges, introduced in Ruby 2.7.
 
-*   Add support to preload associations of polymorphic associations when not all the records have the requested associations.
+    *Josh Goodall*
 
-    *Dana Sherson*
+*   Add `database_exists?` method to connection adapters to check if a database exists.
 
-*   Add `touch_all` method to `ActiveRecord::Relation`.
+    *Guilherme Mansur*
 
-    Example:
+*   Loading the schema for a model that has no `table_name` raises a `TableNotSpecified` error.
 
-        Person.where(name: "David").touch_all(time: Time.new(2020, 5, 16, 0, 0, 0))
+    *Guilherme Mansur*, *Eugene Kenny*
 
-    *fatkodima*, *duggiefresh*
+*   PostgreSQL: Fix GROUP BY with ORDER BY virtual count attribute.
 
-*   Add `ActiveRecord::Base.base_class?` predicate.
+    Fixes #36022.
 
-    *Bogdan Gusiev*
+    *Ryuta Kamizono*
 
-*   Add custom prefix/suffix options to `ActiveRecord::Store.store_accessor`.
+*   Make ActiveRecord `ConnectionPool.connections` method thread-safe.
 
-    *Tan Huynh*, *Yukio Mizuta*
+    Fixes #36465.
 
-*   Rails 6 requires Ruby 2.5.0 or newer.
+    *Jeff Doering*
 
-    *Jeremy Daer*, *Kasper Timm Hansen*
+*   Add support for multiple databases to `rails db:abort_if_pending_migrations`.
 
-*   Deprecate `update_attributes`/`!` in favor of `update`/`!`.
+    *Mark Lee*
 
-    *Eddie Lebow*
+*   Fix sqlite3 collation parsing when using decimal columns.
 
-*   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.
+    *Martin R. Schuster*
 
-    *DHH*
+*   Fix invalid schema when primary key column has a comment.
 
-*   Add `Relation#pick` as short-hand for single-value plucks.
+    Fixes #29966.
 
-    *DHH*
+    *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.