Skip to content

Commit 315748e

Browse files
committed
Merge branch '61-stable'
2 parents e26b15d + 38f4897 commit 315748e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,4 +270,4 @@ jobs:
270270
rake jar
271271
- name: Run tests
272272
run: |
273-
bundle exec rake ${{ matrix.test_targets }}
273+
bundle exec rake ${{ matrix.test_targets }}

lib/arjdbc/jdbc/adapter_require.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
module ActiveRecord
44

5-
if defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0
5+
if defined? ConnectionAdapters::ConnectionHandler # 6.1
6+
ConnectionAdapters::ConnectionHandler
7+
elsif defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0, # 5.x, # 6.0
68
ConnectionAdapters::ConnectionSpecification::Resolver
79
elsif defined? Base::ConnectionSpecification::Resolver # 3.2
810
Base::ConnectionSpecification::Resolver

0 commit comments

Comments
 (0)