Remove hard coded references to Active Record in railties

3 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index 2c683fc3ac..8bad7d0cf5 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -38,7 +38,7 @@ module ActiveRecord
         private
         def resolve_string_connection(spec) # :nodoc:
           hash = configurations.fetch(spec) do |k|
-            self.class.connection_url_to_hash(k)
+            connection_url_to_hash(k)
           end
 
           raise(AdapterNotSpecified, "#{spec} database is not configured") unless hash
@@ -65,7 +65,7 @@ module ActiveRecord
           ConnectionSpecification.new(spec, adapter_method)
         end
 
-        def self.connection_url_to_hash(url) # :nodoc:
+        def connection_url_to_hash(url) # :nodoc:
           config = URI.parse url
           adapter = config.scheme
           adapter = "postgresql" if adapter == "postgres"
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 64eac3aca7..13f3bf7085 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -152,7 +152,7 @@ module ActiveRecord
     # and then establishes the connection.
     initializer "active_record.initialize_database" do |app|
       ActiveSupport.on_load(:active_record) do
-        self.configurations = app.config.database_configuration
+        self.configurations = app.config.database_configuration || {}
         establish_connection
       end
     end
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index f36af7182f..d92e268109 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -2,7 +2,7 @@ require 'active_record'
 
 db_namespace = namespace :db do
   task :load_config do
-    ActiveRecord::Base.configurations = Rails.application.config.database_configuration
+    ActiveRecord::Base.configurations = Rails.application.config.database_configuration || {}
     ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
 
     if defined?(ENGINE_PATH) && engine = Rails::Engine.find(ENGINE_PATH)