From 1f834558ee8ead2519a0408ea6b3b9c391d5e40e Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Tue, 9 May 2023 08:16:05 +0900 Subject: [PATCH] Support `Simplify adapter construction; defer connect until first use` https://github.com/rails/rails/pull/44591 https://github.com/rails/rails/commit/8551e64e2411811f26d210601abdba6e13d8798c --- Gemfile | 2 +- .../connection_adapters/oracle_enhanced_adapter.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e11032910..85819aab1 100644 --- 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 index b5d9551f3..eca568235 100644 --- 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 = {}