diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-10-04 10:28:55 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-04 10:28:55 +0900 |
commit | 54652d886ad1c9ffca36c6f2baadcdd6135ef4dd (patch) | |
tree | 49dd547fa46f19f29aa36a4f1e86a7d3428bd902 /activerecord | |
parent | 4dbb75bd6e1ae675f81767e41538bac846f2e964 (diff) | |
parent | 25839860711987b48b5e5a6d919b4ea294ac10a8 (diff) | |
download | rails-54652d886ad1c9ffca36c6f2baadcdd6135ef4dd.tar.gz rails-54652d886ad1c9ffca36c6f2baadcdd6135ef4dd.tar.bz2 rails-54652d886ad1c9ffca36c6f2baadcdd6135ef4dd.zip |
Merge pull request #34066 from eugeneius/remove_database_warning
Remove unreachable database warning
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 81ad9ef3a2..538659d6bd 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -168,21 +168,7 @@ end_error initializer "active_record.initialize_database" do ActiveSupport.on_load(:active_record) do self.configurations = Rails.application.config.database_configuration - - begin - establish_connection - rescue ActiveRecord::NoDatabaseError - warn <<-end_warning -Oops - You have a database configured, but it doesn't exist yet! - -Here's how to get started: - - 1. Configure your database in config/database.yml. - 2. Run `rails db:create` to create the database. - 3. Run `rails db:setup` to load your database schema. -end_warning - raise - end + establish_connection end end |