Permalink
Browse files

MySQL: allow encoding option for mysql.rb driver.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3293 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 98068a7 commit 224d47e0a38167a92b37cc92a10ecaa97ede4a1d @jeremy jeremy committed Dec 13, 2005
Showing with 3 additions and 5 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +1 −5 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* MySQL: allow encoding option for mysql.rb driver. [Jeremy Kemper]
+
* Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [DHH]. Example:
class Post
@@ -311,11 +311,7 @@ def rename_column(table_name, column_name, new_column_name) #:nodoc:
def connect
encoding = @config[:encoding]
if encoding
- begin
- @connection.options(Mysql::SET_CHARSET_NAME, encoding)
- rescue
- raise ActiveRecord::ConnectionFailed, 'The :encoding option is only available for MySQL 4.1 and later with the mysql-ruby driver. Again, this does not work with the ruby-mysql driver or MySQL < 4.1.'
- end
+ @connection.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil
end
@connection.real_connect(*@connection_options)
execute("SET NAMES '#{encoding}'") if encoding

0 comments on commit 224d47e

Please sign in to comment.