Skip to content

Commit 3eb404e

Browse files
authored
Merge pull request #2331 from yahonda/diag2329
Support `Simplify adapter construction; defer connect until first use`
2 parents 49028d0 + 1f83455 commit 3eb404e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group :development do
1313
gem "rubocop-rails", require: false
1414
gem "rubocop-rspec", require: false
1515

16-
gem "activerecord", github: "rails/rails", ref: "0e9267767f19065fa513038253179ad6b05c29ab"
16+
gem "activerecord", github: "rails/rails", ref: "8551e64e2411811f26d210601abdba6e13d8798c"
1717
gem "ruby-plsql", github: "rsim/ruby-plsql", branch: "master"
1818

1919
platforms :ruby do

lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ def dealloc(stmt)
246246
end
247247
end
248248

249-
def initialize(connection, logger = nil, config = {}) # :nodoc:
250-
super(connection, logger, config)
249+
def initialize(config_or_deprecated_connection, deprecated_logger = nil, deprecated_connection_options = nil, deprecated_config = nil) # :nodoc:
250+
super(config_or_deprecated_connection, deprecated_logger, deprecated_connection_options, deprecated_config)
251251
@enable_dbms_output = false
252252
@do_not_prefetch_primary_key = {}
253253
@columns_cache = {}

0 commit comments

Comments
 (0)