diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2019-05-07 08:20:08 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2019-05-07 08:46:13 +0900 |
| commit | cecbc2340abec0ba96db9394f397f1e5a67c449d (patch) | |
| tree | 4c780f7d0723deb2a7d00c9316ead672ad78de61 | |
| parent | 01f8abd7b2e46aa61eb60a96c456d67364948b24 (diff) | |
| download | rails-cecbc2340abec0ba96db9394f397f1e5a67c449d.tar.gz rails-cecbc2340abec0ba96db9394f397f1e5a67c449d.tar.bz2 rails-cecbc2340abec0ba96db9394f397f1e5a67c449d.zip | |
Properly give defaults for DatabaseSelector options
The initializer receives `nil` for these options when no cofigurations were given:
https://github.com/rails/rails/blob/v6.0.0.rc1/activerecord/lib/active_record/railtie.rb#L91-L97
| -rw-r--r-- | activerecord/lib/active_record/middleware/database_selector.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/middleware/database_selector.rb b/activerecord/lib/active_record/middleware/database_selector.rb index b5b5df074c..93a1a39c3e 100644 --- a/activerecord/lib/active_record/middleware/database_selector.rb +++ b/activerecord/lib/active_record/middleware/database_selector.rb @@ -35,10 +35,10 @@ module ActiveRecord # config.active_record.database_resolver = MyResolver # config.active_record.database_resolver_context = MyResolver::MySession class DatabaseSelector - def initialize(app, resolver_klass = Resolver, context_klass = Resolver::Session, options = {}) + def initialize(app, resolver_klass = nil, context_klass = nil, options = {}) @app = app - @resolver_klass = resolver_klass - @context_klass = context_klass + @resolver_klass = resolver_klass || Resolver + @context_klass = context_klass || Resolver::Session @options = options end |