Upgrade all of rails to version 6.0.4

[depfu]

---

Welcome to Depfu 👋

This is one of the first three pull requests with dependency updates we've sent your way. We tried to start with a few easy patch-level updates. Hopefully your tests will pass and you can merge this pull request without too much risk. This should give you an idea how Depfu works in general.

After you merge your first pull request, we'll send you a few more. We'll never open more than seven PRs at the same time so you're not getting overwhelmed with updates.

Let us know if you have any questions. Thanks so much for giving Depfu a try!

---

Here is everything you need to know about this upgrade. Please take a good look at what changed and the test results before merging this pull request.

What changed?

✳️ activerecord (>= 3.2.3, < 5.2.0 → >= 3.2.3, <= 6.0.4) · Repo · Changelog

Release Notes

6.0.4 (from changelog)

• Only warn about negative enums if a positive form that would cause conflicts exists.

  Fixes #39065.

  Alex Ghiculescu

• Allow the inverse of a has_one association that was previously autosaved to be loaded.

  Fixes #34255.

  Steven Weber

• Reset statement cache for association if table_name is changed.

  Fixes #36453.

  Ryuta Kamizono

• Type cast extra select for eager loading.

  Ryuta Kamizono

• Prevent collection associations from being autosaved multiple times.

  Fixes #39173.

  Eugene Kenny

• 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:

  create_table :books, id: :integer, force: true do |t|
  t.column :name, :string
  t.index "lower(name)", unique: true
  end

  Book.insert_all [{ name: "MyTest" }], unique_by: :index_books_on_lower_name

  Fixes #39516.

  Austen Madden

• Fix preloading for polymorphic association with custom scope.

  Ryuta Kamizono

• Allow relations with different SQL comments in the or method.

  Takumi Shotoku

• Resolve conflict between counter cache and optimistic locking.

  Bump an Active Record instance's lock version after updating its counter cache. This avoids raising an unnecessary ActiveRecord::StaleObjectError upon subsequent transactions by maintaining parity with the corresponding database record's lock_version column.

  Fixes #16449.

  Aaron Lipman

• Fix through association with source/through scope which has joins.

  Ryuta Kamizono

• Fix through association to respect source scope for includes/preload.

  Ryuta Kamizono

• Fix eager load with Arel joins to maintain the original joins order.

  Ryuta Kamizono

• Fix group by count with eager loading + order + limit/offset.

  Ryuta Kamizono

• Fix left joins order when merging multiple left joins from different associations.

  Ryuta Kamizono

• Fix index creation to preserve index comment in bulk change table on MySQL.

  Ryuta Kamizono

• Change remove_foreign_key to not check :validate option if database doesn't support the feature.

  Ryuta Kamizono

• Fix the result of aggregations to maintain duplicated "group by" fields.

  Ryuta Kamizono

• Do not return duplicated records when using preload.

  Bogdan Gusiev

Does any of this look wrong? Please let us know.

Commits

See the full diff on Github. The new version differs by 7 commits:

• Preparing for 6.0.4 release
• Update CHANGELOG
• Merge pull request #42244 from hahmed/fix-invalid-statement-compile-error
• Merge pull request #41528 from yahonda/pg_where_with_set
• Merge pull request #42308 from Shopify/fix-ruby-head-builds
• Escape allow list hosts correctly
• Merge branch '6-0-sec' into 6-0-stable

---

Depfu will automatically keep this PR conflict-free, as long as you don't add any commits to this branch yourself. You can also trigger a rebase manually by commenting with @depfu rebase.

All Depfu comment commands

@​depfu rebase

Rebases against your default branch and redoes this update

@​depfu recreate

Recreates this PR, overwriting any edits that you've made to it

@​depfu merge

Merges this PR once your tests are passing and conflicts are resolved

@​depfu close

Closes this PR and deletes the branch

@​depfu reopen

Restores the branch and reopens this PR (if it's closed)

@​depfu pause

Ignores all future updates for this dependency and closes this PR

@​depfu pause [minor|major]

Ignores all future minor/major updates for this dependency and closes this PR

@​depfu resume

Future versions of this dependency will create PRs again (leaves this PR as is)

[depfu]

Closed in favor of #46.