kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixed error when running db:create with jdbcmysql

Browse source
This commit is contained in:
Rashmi Yadav 2011-04-25 23:05:17 +05:30
parent 17fec021d1
commit 6464f7b9be
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activerecord/lib/active_record/railties/databases.rake
View file

@ -70,7 +70,13 @@ db_namespace = namespace :db do
@charset = ENV['CHARSET'] || 'utf8'
@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
if config['adapter'] =~ /jdbc/
#FIXME After Jdbcmysql gives this class
require 'active_record/railties/jdbcmysql_error'
error_class = ArJdbcMySQL::Error
else
error_class = config['adapter'] =~ /mysql2/ ? Mysql2::Error : Mysql::Error
end
access_denied_error = 1045
begin
ActiveRecord::Base.establish_connection(config.merge('database' => nil))

16
activerecord/lib/active_record/railties/jdbcmysql_error.rb Normal file
View file

@ -0,0 +1,16 @@
#FIXME Remove if ArJdbcMysql will give.
module ArJdbcMySQL
class Error < StandardError
attr_accessor :error_number, :sql_state
def initialize msg
super
@error_number = nil
@sql_state = nil
end
# Mysql gem compatibility
alias_method :errno, :error_number
alias_method :error, :message
end
end