MySQL: create_database takes :charset and :collation options. Charset defaults to utf8. References #8448.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6848 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 29 insertions, 11 deletions

diff --git a/activerecord/test/active_schema_test_mysql.rb b/activerecord/test/active_schema_test_mysql.rb
index b72223526a..d7a20f9338 100644
--- a/activerecord/test/active_schema_test_mysql.rb
+++ b/activerecord/test/active_schema_test_mysql.rb
@@ -5,9 +5,9 @@ class ActiveSchemaTest < Test::Unit::TestCase
     ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
       alias_method :real_execute, :execute
       def execute(sql, name = nil) return sql end
-    end    
+    end
   end
-  
+
   def teardown
     ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:alias_method, :execute, :real_execute)
   end
@@ -15,17 +15,25 @@ class ActiveSchemaTest < Test::Unit::TestCase
   def test_drop_table
     assert_equal "DROP TABLE people", drop_table(:people)
   end
-  
+
+  if current_adapter?(:MysqlAdapter)
+    def test_create_mysql_database_with_encoding
+      assert_equal "CREATE DATABASE `matt` DEFAULT CHARACTER SET `utf8`", create_database(:matt)
+      assert_equal "CREATE DATABASE `aimonetti` DEFAULT CHARACTER SET `latin1`", create_database(:aimonetti, {:charset => 'latin1'})
+      assert_equal "CREATE DATABASE `matt_aimonetti` DEFAULT CHARACTER SET `big5` COLLATE `big5_chinese_ci`", create_database(:matt_aimonetti, {:charset => :big5, :collation => :big5_chinese_ci})
+    end
+  end
+
   def test_add_column
     assert_equal "ALTER TABLE people ADD `last_name` varchar(255)", add_column(:people, :last_name, :string)
   end
-  
+
   def test_add_column_with_limit
     assert_equal "ALTER TABLE people ADD `key` varchar(32)", add_column(:people, :key, :string, :limit => 32)
   end
-  
+
   private
     def method_missing(method_symbol, *arguments)
       ActiveRecord::Base.connection.send(method_symbol, *arguments)
     end
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/adapter_test.rb b/activerecord/test/adapter_test.rb
index 0c12c4d37e..6d986d5dba 100644
--- a/activerecord/test/adapter_test.rb
+++ b/activerecord/test/adapter_test.rb
@@ -19,7 +19,7 @@ class AdapterTest < Test::Unit::TestCase
 
   def test_indexes
     idx_name = "accounts_idx"
-      
+
     if @connection.respond_to?(:indexes)
       indexes = @connection.indexes("accounts")
       assert indexes.empty?
@@ -39,24 +39,34 @@ class AdapterTest < Test::Unit::TestCase
   ensure
     @connection.remove_index(:accounts, :name => idx_name) rescue nil
   end
-  
+
   def test_current_database
     if @connection.respond_to?(:current_database)
       assert_equal ENV['ARUNIT_DB_NAME'] || "activerecord_unittest", @connection.current_database
     end
   end
 
+  if current_adapter?(:MysqlAdapter)
+    def test_charset
+      assert @connection.charset
+    end
+
+    def test_collation
+      assert @connection.collation
+    end
+  end
+
   def test_table_alias
     def @connection.test_table_alias_length() 10; end
     class << @connection
       alias_method :old_table_alias_length, :table_alias_length
       alias_method :table_alias_length,     :test_table_alias_length
     end
-      
+
     assert_equal 'posts',      @connection.table_alias_for('posts')
     assert_equal 'posts_comm', @connection.table_alias_for('posts_comments')
     assert_equal 'dbo_posts',  @connection.table_alias_for('dbo.posts')
-    
+
     class << @connection
       alias_method :table_alias_length, :old_table_alias_length
     end
@@ -66,7 +76,7 @@ class AdapterTest < Test::Unit::TestCase
   if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!)
     require 'fixtures/movie'
     require 'fixtures/subscriber'
-    
+
     def test_reset_empty_table_with_custom_pk
       Movie.delete_all
       Movie.connection.reset_pk_sequence! 'movies'