1 files changed, 32 insertions, 21 deletions
diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
index 3d27c97254..eafbb2c249 100644
--- a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
@@ -1,7 +1,6 @@
 module ActiveRecord
   module Tasks # :nodoc:
     class MySQLDatabaseTasks # :nodoc:
-
       DEFAULT_CHARSET     = ENV['CHARSET']   || 'utf8'
       DEFAULT_COLLATION   = ENV['COLLATION'] || 'utf8_unicode_ci'
       ACCESS_DENIED_ERROR = 1045
@@ -16,18 +15,26 @@ module ActiveRecord
         establish_connection configuration_without_database
         connection.create_database configuration['database'], creation_options
         establish_connection configuration
+      rescue ActiveRecord::StatementInvalid => error
+        if /database exists/ === error.message
+          raise DatabaseAlreadyExists
+        else
+          raise
+        end
       rescue error_class => error
-        raise error unless error.errno == ACCESS_DENIED_ERROR
-
-        $stdout.print error.error
-        establish_connection root_configuration_without_database
-        connection.create_database configuration['database'], creation_options
-        connection.execute grant_statement.gsub(/\s+/, ' ').strip
-        establish_connection configuration
-      rescue error_class => error
-        $stderr.puts error.error
-        $stderr.puts "Couldn't create database for #{configuration.inspect}, #{creation_options.inspect}"
-        $stderr.puts "(If you set the charset manually, make sure you have a matching collation)" if configuration['encoding']
+        if error.respond_to?(:errno) && error.errno == ACCESS_DENIED_ERROR
+          $stdout.print error.error
+          establish_connection root_configuration_without_database
+          connection.create_database configuration['database'], creation_options
+          if configuration['username'] != 'root'
+            connection.execute grant_statement.gsub(/\s+/, ' ').strip
+          end
+          establish_connection configuration
+        else
+          $stderr.puts error.inspect
+          $stderr.puts "Couldn't create database for #{configuration.inspect}, #{creation_options.inspect}"
+          $stderr.puts "(If you set the charset manually, make sure you have a matching collation)" if configuration['encoding']
+        end
       end
 
       def drop
@@ -36,7 +43,7 @@ module ActiveRecord
       end
 
       def purge
-        establish_connection :test
+        establish_connection configuration
         connection.recreate_database configuration['database'], creation_options
       end
 
@@ -53,7 +60,10 @@ module ActiveRecord
         args.concat(["--result-file", "#{filename}"])
         args.concat(["--no-data"])
         args.concat(["#{configuration['database']}"])
-        Kernel.system(*args)
+        unless Kernel.system(*args)
+          $stderr.puts "Could not dump the database structure. "\
+                       "Make sure `mysqldump` is in your PATH and check the command output for warnings."
+        end
       end
 
       def structure_load(filename)
@@ -87,14 +97,15 @@ module ActiveRecord
       end
 
       def error_class
-        case configuration['adapter']
-        when /jdbc/
+        if configuration['adapter'] =~ /jdbc/
           require 'active_record/railties/jdbcmysql_error'
           ArJdbcMySQL::Error
-        when /mysql2/
+        elsif defined?(Mysql2)
           Mysql2::Error
-        else
+        elsif defined?(Mysql)
           Mysql::Error
+        else
+          StandardError
         end
       end
 
@@ -114,7 +125,7 @@ IDENTIFIED BY '#{configuration['password']}' WITH GRANT OPTION;
       end
 
       def root_password
-        $stdout.print "Please provide the root password for your mysql installation\n>"
+        $stdout.print "Please provide the root password for your MySQL installation\n>"
         $stdin.gets.strip
       end
 
@@ -124,11 +135,11 @@ IDENTIFIED BY '#{configuration['password']}' WITH GRANT OPTION;
         args << "--password=#{configuration['password']}"  if configuration['password']
         args.concat(['--default-character-set', configuration['encoding']]) if configuration['encoding']
         configuration.slice('host', 'port', 'socket').each do |k, v|
-          args.concat([ "--#{k}", v ]) if v
+          args.concat([ "--#{k}", v.to_s ]) if v
         end
+
         args
       end
-
     end
   end
 end