diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-25 14:31:29 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-25 14:31:29 -0800 |
| commit | e9f8fe27078dc8cb2093cd5ee4b3aee19f379fdc (patch) | |
| tree | a976b8710434f55095c4d13461e3a81175a8c5df | |
| parent | 278bbfd7df68f50703626ee59c64a2d92928a454 (diff) | |
| parent | dd5503377718e510e9f036261dd9877958713181 (diff) | |
| download | rails-e9f8fe27078dc8cb2093cd5ee4b3aee19f379fdc.tar.gz rails-e9f8fe27078dc8cb2093cd5ee4b3aee19f379fdc.tar.bz2 rails-e9f8fe27078dc8cb2093cd5ee4b3aee19f379fdc.zip | |
Merge pull request #13488 from strzalek/fix-railties-warnings
Fix railties warnings
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 2c796f97e6..2a8cd83285 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -137,6 +137,7 @@ module ActiveRecord ActiveSupport.on_load(:active_record) do class ActiveRecord::NoDatabaseError + remove_possible_method :extend_message def extend_message(message) message << "Run `$ bin/rake db:create db:migrate` to create your database" message diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index 06592eece2..acb7c65af5 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -78,7 +78,7 @@ module ActiveRecord each_current_configuration(environment) { |configuration| create configuration } - ActiveRecord::Base.establish_connection environment + ActiveRecord::Base.establish_connection(environment.to_sym) end def drop(*arguments) |