diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb index b4160494825d87a3751419e6d01a0369e1d3ad93..d35e6b3ef90894836cdf0b048307cdb56070cba7 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/commands/dbconsole.rb @@ -45,7 +45,7 @@ def find_cmd(*commands) end case config["adapter"] -when /^mysql/ +when /mysql/ args = { 'host' => '--host', 'port' => '--port', diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 1cf24343a678a500b92a852b9e17079d98c5fa07..fd10419b38c17a4f086b009b26d126e68a7934e4 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -53,7 +53,7 @@ namespace :db do end rescue case config['adapter'] - when /^mysql/ + when /mysql/ @charset = ENV['CHARSET'] || 'utf8' @collation = ENV['COLLATION'] || 'utf8_unicode_ci' begin @@ -159,7 +159,7 @@ namespace :db do task :charset => :environment do config = ActiveRecord::Base.configurations[RAILS_ENV || 'development'] case config['adapter'] - when /^mysql/ + when /mysql/ ActiveRecord::Base.establish_connection(config) puts ActiveRecord::Base.connection.charset when 'postgresql' @@ -174,7 +174,7 @@ namespace :db do task :collation => :environment do config = ActiveRecord::Base.configurations[RAILS_ENV || 'development'] case config['adapter'] - when /^mysql/ + when /mysql/ ActiveRecord::Base.establish_connection(config) puts ActiveRecord::Base.connection.collation else @@ -274,7 +274,7 @@ namespace :db do task :dump => :environment do abcs = ActiveRecord::Base.configurations case abcs[RAILS_ENV]["adapter"] - when /^mysql/, "oci", "oracle" + when /mysql/, "oci", "oracle" ActiveRecord::Base.establish_connection(abcs[RAILS_ENV]) File.open("#{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump } when "postgresql" @@ -320,7 +320,7 @@ namespace :db do task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do abcs = ActiveRecord::Base.configurations case abcs["test"]["adapter"] - when /^mysql/ + when /mysql/ ActiveRecord::Base.establish_connection(:test) ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0') IO.readlines("#{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table| @@ -354,7 +354,7 @@ namespace :db do task :purge => :environment do abcs = ActiveRecord::Base.configurations case abcs["test"]["adapter"] - when /^mysql/ + when /mysql/ ActiveRecord::Base.establish_connection(:test) ActiveRecord::Base.connection.recreate_database(abcs["test"]["database"], abcs["test"]) when "postgresql" @@ -408,7 +408,7 @@ end def drop_database(config) begin case config['adapter'] - when /^mysql/ + when /mysql/ ActiveRecord::Base.establish_connection(config) ActiveRecord::Base.connection.drop_database config['database'] when /^sqlite/