Merge pull request #2331 from yahonda/diag2329

Support `Simplify adapter construction; defer connect until first use`
rsim · May 25, 2023 · 3eb404e · 3eb404e
2 parents 49028d0 + 1f83455
commit 3eb404e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,7 @@ group :development do
   gem "rubocop-rails", require: false
   gem "rubocop-rspec", require: false
 
-  gem "activerecord",   github: "rails/rails", ref: "0e9267767f19065fa513038253179ad6b05c29ab"
+  gem "activerecord",   github: "rails/rails", ref: "8551e64e2411811f26d210601abdba6e13d8798c"
   gem "ruby-plsql", github: "rsim/ruby-plsql", branch: "master"
 
   platforms :ruby do

diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
@@ -246,8 +246,8 @@ def dealloc(stmt)
           end
       end
 
-      def initialize(connection, logger = nil, config = {}) # :nodoc:
-        super(connection, logger, config)
+      def initialize(config_or_deprecated_connection, deprecated_logger = nil, deprecated_connection_options = nil, deprecated_config = nil) # :nodoc:
+        super(config_or_deprecated_connection, deprecated_logger, deprecated_connection_options, deprecated_config)
         @enable_dbms_output = false
         @do_not_prefetch_primary_key = {}
         @columns_cache = {}