aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/mysql
diff options
context:
space:
mode:
authorBrian Lopez <seniorlopez@gmail.com>2010-08-02 01:37:57 -0700
committerBrian Lopez <seniorlopez@gmail.com>2010-08-02 01:37:57 -0700
commit21e81da33570ba9453831cfc59c4f42ff9cdc1b2 (patch)
tree80146b258842d120e3362119971971911ca6a0ef /activerecord/test/cases/adapters/mysql
parentfb0bd8c1092db51888ec4bb72af6c595e13c31fa (diff)
downloadrails-21e81da33570ba9453831cfc59c4f42ff9cdc1b2.tar.gz
rails-21e81da33570ba9453831cfc59c4f42ff9cdc1b2.tar.bz2
rails-21e81da33570ba9453831cfc59c4f42ff9cdc1b2.zip
update tests for mysql2 support
Diffstat (limited to 'activerecord/test/cases/adapters/mysql')
-rw-r--r--activerecord/test/cases/adapters/mysql/active_schema_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql/active_schema_test.rb b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
index ed4efdc1c0..509baacaef 100644
--- a/activerecord/test/cases/adapters/mysql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
@@ -42,7 +42,7 @@ class ActiveSchemaTest < ActiveRecord::TestCase
assert_equal "DROP TABLE `people`", drop_table(:people)
end
- if current_adapter?(:MysqlAdapter)
+ if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
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'})