From 0b517e3e12a370780be8cb91d2c73d28defa7564 Mon Sep 17 00:00:00 2001 From: Neeraj Singh Date: Mon, 30 Aug 2010 16:09:09 -0400 Subject: [PATCH] error method is different for mysql2 [#5502 state:resolved] --- .../lib/active_record/railties/databases.rake | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index b1aad0d..038d734 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -62,13 +62,14 @@ namespace :db do @collation = ENV['COLLATION'] || 'utf8_unicode_ci' creation_options = {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)} error_class = config['adapter'] =~ /mysql2/ ? Mysql2::Error : Mysql::Error + error_num = config['adapter'] =~ /mysql2/ ? :error_number : :errno access_denied_error = 1045 begin ActiveRecord::Base.establish_connection(config.merge('database' => nil)) ActiveRecord::Base.connection.create_database(config['database'], creation_options) ActiveRecord::Base.establish_connection(config) rescue error_class => sqlerr - if sqlerr.errno == access_denied_error + if sqlerr.send(error_num) == access_denied_error print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>" root_password = $stdin.gets.strip grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \ -- 1.7.2