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

Rails 6.1 fixes #1078

Merged
merged 4 commits into from Nov 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -15,7 +15,7 @@ install:

language: ruby
rvm:
- jruby-9.2.9.0
- jruby-9.2.13.0
jdk:
- openjdk8

Expand Down
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -117,8 +117,8 @@ Proceed as with Rails; specify `ActiveRecord` in your Bundle along with the
chosen JDBC adapter(s), this time sample *Gemfile* for MySQL:

```ruby
gem 'activerecord', '~> 5.0.6'
gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
gem 'activerecord', '~> 6.0.3'
gem 'activerecord-jdbcmysql-adapter', '~> 60.2', :platform => :jruby
```

When you `require 'bundler/setup'` everything will be set up for you as expected.
Expand All @@ -127,13 +127,13 @@ When you `require 'bundler/setup'` everything will be set up for you as expected

Install the needed gems with JRuby, for example:

gem install activerecord -v "~> 5.0.6"
gem install activerecord-jdbc-adapter --ignore-dependencies
gem install activerecord -v "~> 6.0.3"
gem install activerecord-jdbc-adapter -v "~> 60.2" --ignore-dependencies

If you wish to use the adapter for a specific database, you can install it
directly and the (jdbc-) driver gem (dependency) will be installed as well:

jruby -S gem install activerecord-jdbcmysql-adapter
jruby -S gem install activerecord-jdbcmysql-adapter -v "~> 60.2"

Your program should include:

Expand Down Expand Up @@ -173,7 +173,7 @@ ask on the #JRuby IRC channel on http://freenode.net/ (try [web-chat][6]).
This project was originally written by [Nick Sieger](http://github.com/nicksieger)
and [Ola Bini](http://github.com/olabini) with lots of help from the JRuby community.
Polished 3.x compatibility and 4.x support (for AR-JDBC >= 1.3.0) was managed by
[Karol Bucek](http://github.com/kares) among others. Support for Rails 6 was
[Karol Bucek](http://github.com/kares) among others. Support for Rails 6.0 and 6.1 was
contributed by [shellyBits GmbH](https://shellybits.ch/)

## License
Expand Down
2 changes: 1 addition & 1 deletion activerecord-jdbc-adapter.gemspec
Expand Up @@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^test/})

gem.add_dependency 'activerecord', '~> 6.0.0'
gem.add_dependency 'activerecord', '~> 6.1.a'

#gem.add_development_dependency 'test-unit', '2.5.4'
#gem.add_development_dependency 'test-unit-context', '>= 0.3.0'
Expand Down
Expand Up @@ -10,3 +10,4 @@
exclude :test_shards_can_be_swapped_granularly, 'tries to load SQLite3 driver'
exclude :test_roles_and_shards_can_be_swapped_granularly, 'tries to load SQLite3 driver'
exclude :test_connected_to_many, 'tries to load SQLite3 driver'
exclude :test_prevent_writes_can_be_changed_granularly, 'tries to load SQLite3 driver'
Expand Up @@ -10,3 +10,4 @@
exclude :test_shards_can_be_swapped_granularly, 'tries to load SQLite3 driver'
exclude :test_roles_and_shards_can_be_swapped_granularly, 'tries to load SQLite3 driver'
exclude :test_connected_to_many, 'tries to load SQLite3 driver'
exclude :test_prevent_writes_can_be_changed_granularly, 'tries to load SQLite3 driver'