Cleaning up after some warnings, adding slightly higher-level tests.

4 files changed, 13 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
index 7174c63b38..e49af454b5 100644
--- a/activerecord/lib/active_record/tasks/database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -19,7 +19,7 @@ class ActiveRecord::Tasks::DatabaseTasks
 
   def self.create_current
     each_current_configuration { |configuration| create configuration }
-    ActiveRecord::Base.establish_connection Rails.env.to_sym
+    ActiveRecord::Base.establish_connection Rails.env
   end
 
   def self.drop(configuration)
@@ -44,7 +44,7 @@ class ActiveRecord::Tasks::DatabaseTasks
   private
 
   def self.class_for_adapter(adapter)
-    key = TASKS_PATTERNS.keys.detect { |key| adapter[key] }
+    key = TASKS_PATTERNS.keys.detect { |pattern| adapter[pattern] }
     TASKS_PATTERNS[key]
   end
 
@@ -52,7 +52,7 @@ class ActiveRecord::Tasks::DatabaseTasks
     environments = [Rails.env]
     environments << 'test' if Rails.env.development?
 
-    configurations = ActiveRecord::Base.configurations.values_at *environments
+    configurations = ActiveRecord::Base.configurations.values_at(*environments)
     configurations.compact.each do |configuration|
       yield configuration unless configuration['database'].blank?
     end
diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
index a1d36f0855..eb598629fa 100644
--- a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
@@ -39,7 +39,9 @@ class ActiveRecord::Tasks::MySQLDatabaseTasks
 
   private
 
-  attr_reader :configuration
+  def configuration
+    @configuration
+  end
 
   def configuration_without_database
     configuration.merge('database' => nil)
@@ -56,7 +58,7 @@ class ActiveRecord::Tasks::MySQLDatabaseTasks
     case configuration['adapter']
     when /jdbc/
       require 'active_record/railties/jdbcmysql_error'
-      error_class = ArJdbcMySQL::Error
+      ArJdbcMySQL::Error
     when /mysql2/
       Mysql2::Error
     else
diff --git a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
index c3c5b2f2f5..331825d3ec 100644
--- a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
@@ -28,7 +28,9 @@ class ActiveRecord::Tasks::PostgreSQLDatabaseTasks
 
   private
 
-  attr_reader :configuration
+  def configuration
+    @configuration
+  end
 
   def encoding
     configuration['encoding'] || DEFAULT_ENCODING
diff --git a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
index fff763421b..8f8021f47c 100644
--- a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
@@ -27,5 +27,7 @@ class ActiveRecord::Tasks::SQLiteDatabaseTasks
 
   private
 
-  attr_reader :configuration
+  def configuration
+    @configuration
+  end
 end