Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Rails 6.1 support #108

Merged
merged 2 commits into from
Dec 18, 2020
Merged

Add Rails 6.1 support #108

merged 2 commits into from
Dec 18, 2020

Conversation

ilvez
Copy link
Contributor

@ilvez ilvez commented Dec 18, 2020

An attempt to add Rails 6.1 support. I'm not really sure about the changes, just took e8972ce as an example and made changes that seemed reasonable. Not sure about version specific compatibility need (using 'active_record_upsert/compatibility/rails60.rb'), but my local tests passed.

@ilvez
Copy link
Contributor Author

ilvez commented Dec 18, 2020

So there is big requirements change in postgresql_adapter.rb in activerecord. rails/rails@592358e

In 6.0.3.4 (activerecord-6.0.3.4/lib/active_record/connection_adapters/postgresql_adapter.rb):

# Make sure we're using pg high enough for type casts and Ruby 2.2+ compatibility
gem "pg", ">= 0.18", "< 2.0"
require "pg"

In 6.1.0 (activerecord-6.1.0/lib/active_record/connection_adapters/postgresql_adapter.rb):

gem "pg", "~> 1.1"
require "pg"

@olleolleolle olleolleolle requested a review from jesjos December 18, 2020 13:21
Copy link
Collaborator

@olleolleolle olleolleolle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this looks good, and it was the right call to skip adding a not-used compat Ruby file for the 6.1 version.

@olleolleolle olleolleolle merged commit f5491f3 into jesjos:master Dec 18, 2020
@ilvez ilvez deleted the rails-6-1-support branch December 18, 2020 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants