Merge pull request #1096 from terencechow/patch-1

enebo · web-flow · commit 834b7757a52e · 2022-04-29T09:59:23.000-05:00
allow loading jdbc adapters for 6.1
diff --git a/lib/arjdbc/jdbc/adapter_require.rb b/lib/arjdbc/jdbc/adapter_require.rb
@@ -2,7 +2,9 @@
 
 module ActiveRecord
 
-  if defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0
+  if defined? ConnectionAdapters::ConnectionHandler # 6.1
+    ConnectionAdapters::ConnectionHandler
+  elsif defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0, # 5.x, # 6.0
     ConnectionAdapters::ConnectionSpecification::Resolver
   elsif defined? Base::ConnectionSpecification::Resolver # 3.2
     Base::ConnectionSpecification::Resolver
diff --git a/lib/arjdbc/version.rb b/lib/arjdbc/version.rb
@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '61.1'
+  VERSION = '62.0'
 end
